diff --git a/ChangeLog b/ChangeLog
index c4e9b24ea8..629990abfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-22  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/autodetect/Makefile.am:
+	Don't link the autodetect plugin with GConf as it doesn't
+	use GConf. Fixes bug #545463.
+
 2008-08-22  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* gst/matroska/ebml-read.c: (gst_ebml_read_element_id),
diff --git a/gst/autodetect/Makefile.am b/gst/autodetect/Makefile.am
index 7c73402f68..1ecd9ce296 100644
--- a/gst/autodetect/Makefile.am
+++ b/gst/autodetect/Makefile.am
@@ -4,8 +4,8 @@ libgstautodetect_la_SOURCES = \
 	gstautoaudiosink.c \
 	gstautodetect.c \
 	gstautovideosink.c
-libgstautodetect_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
-libgstautodetect_la_LIBADD = $(GST_LIBS) $(GCONF_LIBS)
+libgstautodetect_la_CFLAGS = $(GST_CFLAGS)
+libgstautodetect_la_LIBADD = $(GST_LIBS)
 libgstautodetect_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = \