Index: Makefile.linux
===================================================================
--- Makefile.linux	(revision 9563)
+++ Makefile.linux	(working copy)
@@ -170,7 +170,7 @@
 
 # flac
 flac-1.2.1/Makefile:
-	cd flac-1.2.1; ./configure --disable-ogg --disable-xmms-plugin --host=${HOST} --target=${TARGET} --prefix=${PREFIX}
+	cd flac-1.2.1; ./configure --disable-xmms-plugin --host=${HOST} --target=${TARGET} --prefix=${PREFIX}
 
 flac: flac-1.2.1/Makefile
 	cd flac-1.2.1; make && make install
Index: flac-1.2.1/src/libFLAC/Makefile.in
===================================================================
--- flac-1.2.1/src/libFLAC/Makefile.in	(revision 9563)
+++ flac-1.2.1/src/libFLAC/Makefile.in	(working copy)
@@ -96,7 +96,8 @@
 libFLAC_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libFLAC_la_OBJECTS = bitmath.lo bitreader.lo bitwriter.lo cpu.lo \
 	crc.lo fixed.lo float.lo format.lo lpc.lo md5.lo memory.lo \
-	metadata_iterators.lo metadata_object.lo stream_decoder.lo
+	metadata_iterators.lo metadata_object.lo stream_decoder.lo \
+	ogg_decoder_aspect.lo ogg_helper.lo ogg_mapping.lo
 libFLAC_la_OBJECTS = $(am_libFLAC_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -331,7 +332,6 @@
 
 @FLaC__HAS_OGG_TRUE@extra_ogg_sources = \
 @FLaC__HAS_OGG_TRUE@	ogg_decoder_aspect.c \
-@FLaC__HAS_OGG_TRUE@	ogg_encoder_aspect.c \
 @FLaC__HAS_OGG_TRUE@	ogg_helper.c \
 @FLaC__HAS_OGG_TRUE@	ogg_mapping.c
 
@@ -352,8 +352,6 @@
 	metadata_iterators.c \
 	metadata_object.c \
 	stream_decoder.c \
-	#stream_encoder.c \
-	#stream_encoder_framing.c \
 	window.c \
 	$(extra_ogg_sources)
 
@@ -442,6 +440,9 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata_iterators.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata_object.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_decoder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg_decoder_aspect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg_helper.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg_mapping.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
Index: squeezeplay/src/audio/decode/decode_flac.c
===================================================================
--- squeezeplay/src/audio/decode/decode_flac.c	(revision 9563)
+++ squeezeplay/src/audio/decode/decode_flac.c	(working copy)
@@ -192,18 +192,39 @@
 	self->decoder = FLAC__stream_decoder_new();
 	// XXXX error handling
 
-	FLAC__stream_decoder_init_stream(
-		self->decoder,
-		decode_flac_read_callback,
-		NULL, /* seek_callback */
-		NULL, /* tell_callback */
-		NULL, /* length_callback */
-		NULL, /* eof_callback */
-		decode_flac_write_callback,
-		decode_flac_metadata_callback,
-		decode_flac_error_callback,
-		self
+	if (params[0] != 'o') {
+
+		FLAC__stream_decoder_init_stream(
+			self->decoder,
+			decode_flac_read_callback,
+			NULL, /* seek_callback */
+			NULL, /* tell_callback */
+			NULL, /* length_callback */
+			NULL, /* eof_callback */
+			decode_flac_write_callback,
+			decode_flac_metadata_callback,
+			decode_flac_error_callback,
+			self
 		);
+
+	} else {
+
+		LOG_DEBUG(log_audio_codec, "oggflac stream - using init_ogg_stream()");
+
+		FLAC__stream_decoder_init_ogg_stream(
+			self->decoder,
+			decode_flac_read_callback,
+			NULL, /* seek_callback */
+			NULL, /* tell_callback */
+			NULL, /* length_callback */
+			NULL, /* eof_callback */
+			decode_flac_write_callback,
+			decode_flac_metadata_callback,
+			decode_flac_error_callback,
+			self
+		);
+	}
+
 	// XXXX error handling
 
 	/* Assume we aren't changing sample rates until proven wrong */
@@ -233,7 +254,7 @@
 
 struct decode_module decode_flac = {
 	'f',
-	"flc",
+	"flc,ogf",
 	decode_flac_start,
 	decode_flac_stop,
 	decode_flac_samples,