diff --git a/ChangeLog b/ChangeLog
index 87312cd650..3eb8009370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-24  Steve Lhomme  <steve.lhomme at free dot fr>
+
+	* gst/registries/gstxmlregistry.c:
+	Remove the registry before renaming the tempfile (needed for Windows)
+
 2004-07-23  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* gst/elements/gstmultifilesrc.c: (gst_multifilesrc_class_init),
diff --git a/gst/registries/gstxmlregistry.c b/gst/registries/gstxmlregistry.c
index 41499145c7..ec84d5c9a9 100644
--- a/gst/registries/gstxmlregistry.c
+++ b/gst/registries/gstxmlregistry.c
@@ -631,8 +631,10 @@ gst_xml_registry_close_func (GstXMLRegistry * registry)
 
   /* If we opened for writing, rename our temporary file. */
   tmploc = g_strconcat (registry->location, ".tmp", NULL);
-  if (g_file_test (tmploc, G_FILE_TEST_EXISTS))
+  if (g_file_test (tmploc, G_FILE_TEST_EXISTS)) {
+    remove (registry->location);
     rename (tmploc, registry->location);
+  }
   g_free (tmploc);
 
   registry->open = FALSE;