diff --git a/ChangeLog b/ChangeLog
index bd751a64c8..19a1edba37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-10  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* configure.ac:
+	Disable flacparse for this release as it's too buggy.
+
 2008-10-10  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* gst/flacparse/gstbaseparse.c (gst_base_parse_push_buffer),
diff --git a/configure.ac b/configure.ac
index 0a9153b6cb..38f507a48f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -251,8 +251,6 @@ AG_GST_CHECK_PLUGIN(deinterlace2)
 AG_GST_CHECK_PLUGIN(dvdspu)
 AG_GST_CHECK_PLUGIN(festival)
 AG_GST_CHECK_PLUGIN(filter)
-AG_GST_CHECK_PLUGIN(flacparse)
-AG_GST_CHECK_PLUGIN(flacparse)
 AG_GST_CHECK_PLUGIN(flv)
 AG_GST_CHECK_PLUGIN(freeze)
 AG_GST_CHECK_PLUGIN(h264parse)
@@ -1404,7 +1402,6 @@ gst/deinterlace2/Makefile
 gst/dvdspu/Makefile
 gst/festival/Makefile
 gst/filter/Makefile
-gst/flacparse/Makefile
 gst/flv/Makefile
 gst/freeze/Makefile
 gst/h264parse/Makefile