diff --git a/ChangeLog b/ChangeLog
index a257dbdd09..559bcad4e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-31  David Schleef  <ds@schleef.org>
+
+	* gst/gstplugin.c: (gst_plugin_check_file), (gst_plugin_load_file):
+	Switch to using G_MODULE_BIND_LOCAL, which means plugins are now
+	expected to link against libgstreamer.
+	* gst/base/Makefile.am: link against libgstreamer
+	* gst/elements/Makefile.am: same
+
 2005-03-31  Andy Wingo  <wingo@pobox.com>
 
 	* tests/instantiate/Makefile.am:
diff --git a/gst/base/Makefile.am b/gst/base/Makefile.am
index dda7031d9a..0c790e8412 100644
--- a/gst/base/Makefile.am
+++ b/gst/base/Makefile.am
@@ -4,13 +4,15 @@ AS_LIBTOOL_LIB = libgstbase-@GST_MAJORMINOR@
 EXTRA_DIST = $(as_libtool_EXTRA_DIST)
 noinst_DATA = $(as_libtool_noinst_DATA_files)
 
-libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
+libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = \
+	../libgstreamer-@GST_MAJORMINOR@.la
 libgstbase_@GST_MAJORMINOR@_la_SOURCES =	\
 	gstbasesink.c	\
 	gstbasetransform.c	
 
 libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
+libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) \
+	../libgstreamer-@GST_MAJORMINOR@.la
 libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(as_libtool_LDFLAGS)
 
 libgstbase_@GST_MAJORMINOR@includedir =		\
diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am
index 467cc79431..1cd9bc1516 100644
--- a/gst/elements/Makefile.am
+++ b/gst/elements/Makefile.am
@@ -49,9 +49,10 @@ EXTRA_DIST +=			\
 
 
 libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstelements_la_LIBADD = $(GST_OBJ_LIBS)
-libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS) \
-	 $(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la
+libgstelements_la_LIBADD = $(GST_OBJ_LIBS) \
+	$(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
+libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
 
 noinst_HEADERS =		\
 	gstaggregator.h		\
diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index cb5e635db9..5c4dbb9dc7 100644
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -333,7 +333,7 @@ gst_plugin_check_file (const gchar * filename, GError ** error)
     return FALSE;
   }
 
-  module = g_module_open (filename, G_MODULE_BIND_LAZY);
+  module = g_module_open (filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
 
   if (module == NULL) {
     GST_DEBUG ("Error loading plugin %s, reason: %s\n", filename,
@@ -384,7 +384,7 @@ gst_plugin_load_file (const gchar * filename, GError ** error)
   if (!gst_plugin_check_file (filename, error))
     return NULL;
 
-  module = g_module_open (filename, G_MODULE_BIND_LAZY);
+  module = g_module_open (filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
 
   if (module == NULL)
     goto load_error;
diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am
index dda7031d9a..0c790e8412 100644
--- a/libs/gst/base/Makefile.am
+++ b/libs/gst/base/Makefile.am
@@ -4,13 +4,15 @@ AS_LIBTOOL_LIB = libgstbase-@GST_MAJORMINOR@
 EXTRA_DIST = $(as_libtool_EXTRA_DIST)
 noinst_DATA = $(as_libtool_noinst_DATA_files)
 
-libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
+libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = \
+	../libgstreamer-@GST_MAJORMINOR@.la
 libgstbase_@GST_MAJORMINOR@_la_SOURCES =	\
 	gstbasesink.c	\
 	gstbasetransform.c	
 
 libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
+libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) \
+	../libgstreamer-@GST_MAJORMINOR@.la
 libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(as_libtool_LDFLAGS)
 
 libgstbase_@GST_MAJORMINOR@includedir =		\
diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 467cc79431..1cd9bc1516 100644
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -49,9 +49,10 @@ EXTRA_DIST +=			\
 
 
 libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstelements_la_LIBADD = $(GST_OBJ_LIBS)
-libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS) \
-	 $(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la
+libgstelements_la_LIBADD = $(GST_OBJ_LIBS) \
+	$(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
+libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
 
 noinst_HEADERS =		\
 	gstaggregator.h		\