diff --git a/ChangeLog b/ChangeLog
index 640b431987..5f8fb83e36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-23  Edward Hervey  <edward@fluendo.com>
+
+	* configure.ac:
+	* gst/Makefile.am:
+	* gst/interfaces.defs:
+	* gst/interfaces.override:
+	* gst/xoverlay.override:
+	It seems that, somewhere along the way, I forgot to make sure interfaces
+	were binded too :)
+
 2005-07-21  Edward Hervey  <edward@fluendo.com>
 
 	* gst/gstmessage.override:
diff --git a/configure.ac b/configure.ac
index e76d0d3beb..d0813057b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ AC_MSG_RESULT($PYGTK_CODEGEN)
 
 dnl Interfaces
 AC_MSG_CHECKING(for GStreamer interfaces include dir)
-PKG_CHECK_MODULES(GST_INTERFACES, gstreamer-interfaces-$GST_MAJORMINOR,
+PKG_CHECK_MODULES(GST_INTERFACES, gstreamer-plugins-base-$GST_MAJORMINOR,
                   HAVE_INTERFACES=yes,HAVE_INTERFACES=no)
 AM_CONDITIONAL(BUILD_INTERFACES, test "x$HAVE_INTERFACES" = "xyes")
 AC_SUBST(GST_INTERFACES_CFLAGS)
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 484370bf4c..a26cb38ec7 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -54,7 +54,7 @@ gst.c: $(GST_DEFS) $(GST_OVERRIDES) $(GEN_FILES)
 
 # GStreamer interfaces bindings
 interfaces_la_CFLAGS = $(common_cflags) $(GST_INTERFACES_CFLAGS) 
-interfaces_la_LIBADD = $(common_libadd) $(GST_INTERFACES_LIBS)
+interfaces_la_LIBADD = $(common_libadd) $(GST_INTERFACES_LIBS) -lgstinterfaces-0.9 
 interfaces_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initinterface
 interfaces_la_SOURCES = interfacesmodule.c
 nodist_interfaces_la_SOURCES = interfaces.c
diff --git a/gst/interfaces.defs b/gst/interfaces.defs
index be36da0a46..45f9ef767b 100644
--- a/gst/interfaces.defs
+++ b/gst/interfaces.defs
@@ -130,6 +130,25 @@
   )
 )
 
+(define-method set_option
+  (of-object "GstMixer")
+  (c-name "gst_mixer_set_option")
+  (return-type "none")
+  (parameters
+    '("GstMixerOptions*" "opts")
+    '("gchar*" "value")
+  )
+)
+
+(define-method get_option
+  (of-object "GstMixer")
+  (c-name "gst_mixer_get_option")
+  (return-type "const-gchar*")
+  (parameters
+    '("GstMixerOptions*" "opts")
+  )
+)
+
 (define-method mute_toggled
   (of-object "GstMixer")
   (c-name "gst_mixer_mute_toggled")
diff --git a/gst/interfaces.override b/gst/interfaces.override
index 524fb73ca9..9be6874ec7 100644
--- a/gst/interfaces.override
+++ b/gst/interfaces.override
@@ -29,26 +29,11 @@ headers
 
 #include <gst/gst.h>
 
-/* XXX: Remove this macros in 0.9 */
-#include <gst/colorbalance/colorbalance.h>
-#undef  GST_COLOR_BALANCE
-#define GST_COLOR_BALANCE(obj)  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE, GstColorBalance))
-
-#include <gst/navigation/navigation.h>
-#undef  GST_NAVIGATION
-#define GST_NAVIGATION(obj)     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_NAVIGATION, GstNavigation))
-
-#include <gst/propertyprobe/propertyprobe.h>
-#undef  GST_PROPERTY_PROBE
-#define GST_PROPERTY_PROBE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PROPERTY_PROBE, GstPropertyProbe))
-
-#include <gst/tuner/tuner.h>
-#undef  GST_TUNER
-#define GST_TUNER(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER, GstTuner))
-
-#include <gst/mixer/mixer.h>
-#undef  GST_MIXER
-#define GST_MIXER(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MIXER, GstMixer))
+#include <gst/interfaces/colorbalance.h>
+#include <gst/interfaces/navigation.h>
+#include <gst/interfaces/propertyprobe.h>
+#include <gst/interfaces/tuner.h>
+#include <gst/interfaces/mixer.h>
 
 %%
 modulename gst.interfaces
diff --git a/gst/xoverlay.override b/gst/xoverlay.override
index 377fc1b63d..dd382e7655 100644
--- a/gst/xoverlay.override
+++ b/gst/xoverlay.override
@@ -21,6 +21,4 @@
 %%
 headers
 
-#include <gst/xoverlay/xoverlay.h>
-#undef  GST_X_OVERLAY
-#define GST_X_OVERLAY(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_X_OVERLAY, GstXOverlay))
+#include <gst/interfaces/xoverlay.h>