diff --git a/ChangeLog b/ChangeLog
index 92a0c0b38f..ae67ac8b4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-06  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/gnomevfs/gstgnomevfs.c: (plugin_init):
+	  Return FALSE from plugin_init() when GnomeVFS can't
+	  be initialised for some reason (#328423).
+
 2006-02-06  Julien MOUTTE  <julien@moutte.net>
 
 	* ext/pango/gsttextoverlay.c: (gst_text_overlay_src_event): 
diff --git a/common b/common
index 79d67fe009..58567e5519 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 79d67fe009b6120b82d51df860c78e8361f02aea
+Subproject commit 58567e5519f2d00a4592491db1a6e8302993279e
diff --git a/ext/gnomevfs/gstgnomevfs.c b/ext/gnomevfs/gstgnomevfs.c
index 6eb5a46a91..b6b12599c0 100644
--- a/ext/gnomevfs/gstgnomevfs.c
+++ b/ext/gnomevfs/gstgnomevfs.c
@@ -77,8 +77,12 @@ static gboolean
 plugin_init (GstPlugin * plugin)
 {
   /* gnome vfs engine init */
-  if (!gnome_vfs_initialized ())
-    gnome_vfs_init ();
+  if (!gnome_vfs_initialized ()) {
+    if (!gnome_vfs_init ()) {
+      GST_WARNING ("Failed to initialize GnomeVFS - not registering plugin!");
+      return FALSE;
+    }
+  }
 
   if (!gst_element_register (plugin, "gnomevfssrc", GST_RANK_SECONDARY,
           gst_gnome_vfs_src_get_type ()))