diff --git a/ChangeLog b/ChangeLog
index 8dc864af78..b89ea06c5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-02  Johan Dahlin  <johan@gnome.org>
+
+	* ext/gnomevfs/gstgnomevfssrc.c (gst_gnomevfssrc_uri_get_protocols): 
+	protect gst_gnomevfs_get_supported_uris by a mutex, to make it
+	MT safe.
+
 2005-10-02  Andy Wingo  <wingo@pobox.com>
 
 	* gst-libs/gst/audio/gstringbuffer.c (gst_ring_buffer_clear) 
diff --git a/ext/gnomevfs/gstgnomevfssrc.c b/ext/gnomevfs/gstgnomevfssrc.c
index 92914a16b1..bee1ffa4a3 100644
--- a/ext/gnomevfs/gstgnomevfssrc.c
+++ b/ext/gnomevfs/gstgnomevfssrc.c
@@ -106,6 +106,7 @@ typedef struct _GstGnomeVFSSrc
   gint audiocast_thread_die_outfd;
   gint audiocast_port;
   gint audiocast_fd;
+  GMutex *list_uris_mutex;
 } GstGnomeVFSSrc;
 
 typedef struct _GstGnomeVFSSrcClass
@@ -343,9 +344,16 @@ static gchar **
 gst_gnomevfssrc_uri_get_protocols (void)
 {
   static gchar **protocols = NULL;
+  static GMutex *mutex = NULL;
 
-  if (!protocols)
+  if (G_UNLIKELY (!protocols)) {
+    if (!mutex)
+      mutex = g_mutex_new ();
+
+    g_mutex_lock (mutex);
     protocols = gst_gnomevfs_get_supported_uris ();
+    g_mutex_unlock (mutex);
+  }
 
   return protocols;
 }