diff --git a/ChangeLog b/ChangeLog
index 1d0fcc05ba..af314af83c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2005-08-29  Stefan Kost  <ensonic@users.sf.net>
 
-	reviewed by: <delete if not using a buddy>
+	* configure.ac:
+	* gst/sine/Makefile.am:
+	* gst/volume/Makefile.am:
+          controllerized elements also need to link against controller-libs ;)
+
+2005-08-29  Stefan Kost  <ensonic@users.sf.net>
 
 	* docs/libs/tmpl/gstcolorbalance.sgml:
 	* docs/libs/tmpl/gstgconf.sgml:
diff --git a/configure.ac b/configure.ac
index 94eb1bccaf..6e3f2dcc1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,6 +236,16 @@ fi
 
 AC_SUBST(GST_GDP_LIBS)
 
+dnl check for gstreamer-controller; uninstalled is selected preferentially
+PKG_CHECK_MODULES(GST_CTRL, gstreamer-controller-$GST_MAJORMINOR >= $GST_REQ,
+  HAVE_GST_CTRL="yes", HAVE_GST_CTRL="no")
+
+if test "x$HAVE_GST_CTRL" = "xno"; then
+  AC_MSG_ERROR(no GStreamer Controller Libs found)
+fi
+
+AC_SUBST(GST_CTRL_LIBS)
+
 PKG_CHECK_MODULES(GST_BASE, gstreamer-base-$GST_MAJORMINOR >= $GST_REQ,
   HAVE_GST_BASE="yes", HAVE_GST_BASE="no")
 
diff --git a/gst/sine/Makefile.am b/gst/sine/Makefile.am
index 3c06bcf867..1110626366 100644
--- a/gst/sine/Makefile.am
+++ b/gst/sine/Makefile.am
@@ -3,6 +3,6 @@ plugin_LTLIBRARIES = libgstsinesrc.la
 libgstsinesrc_la_SOURCES = gstsinesrc.c
 libgstsinesrc_la_CFLAGS = $(GST_CFLAGS)
 libgstsinesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsinesrc_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
+libgstsinesrc_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_CTRL_LIBS)
 
 noinst_HEADERS = gstsinesrc.h
diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am
index 3ea28df27a..4bf29ae3a0 100644
--- a/gst/volume/Makefile.am
+++ b/gst/volume/Makefile.am
@@ -6,7 +6,8 @@ libgstvolume_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvolume_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
 	$(GST_BASE_LIBS) \
-	$(GST_LIBS)
+	$(GST_LIBS) \
+        $(GST_CTRL_LIBS)
 
 noinst_HEADERS = gstvolume.h