diff --git a/ChangeLog b/ChangeLog
index beaa3cd82d..b37a4f557a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-31  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* ext/flac/Makefile.am:
+	Include $(FLAC_CFLAGS) in CFLAGS to make sure to find the FLAC headers.
+	This fixes compilation if FLAC is installed in an uncommon location
+	that is not already handled by other CFLAGS. Fixes bug #558711.
+
 2008-10-31  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_format_get_rank):
diff --git a/ext/flac/Makefile.am b/ext/flac/Makefile.am
index 0e7d41a2f1..24be2b6fdc 100644
--- a/ext/flac/Makefile.am
+++ b/ext/flac/Makefile.am
@@ -1,7 +1,7 @@
 plugin_LTLIBRARIES = libgstflac.la
 
 libgstflac_la_SOURCES = gstflac.c gstflacdec.c gstflacenc.c gstflactag.c
-libgstflac_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstflac_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(FLAC_CFLAGS)
 libgstflac_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
 	-lgstaudio-$(GST_MAJORMINOR) \