diff --git a/ChangeLog b/ChangeLog
index 3baf7554ed..99c4c8bd25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-12  Michael Smith  <msmith@fluendo.com>
+
+	* gst/gstplugin.c: (gst_plugin_load_file):
+	  If an so file has no plugin entry point, unload the module.
+
 2006-05-11  Wim Taymans  <wim@fluendo.com>
 
 	* plugins/elements/gstqueue.c: (gst_queue_chain), (gst_queue_loop),
diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index b2a5977f97..5981ec86a5 100644
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -428,6 +428,7 @@ gst_plugin_load_file (const gchar * filename, GError ** error)
         GST_PLUGIN_ERROR,
         GST_PLUGIN_ERROR_MODULE,
         "File \"%s\" is not a GStreamer plugin", filename);
+    g_module_close (module);
     goto return_error;
   }
   plugin->orig_desc = (GstPluginDesc *) ptr;