diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index f36e91097..4c972b9e1 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gdesktop.c (text_changed): Rename the metadata and refresh the
+	desktop.  This also fixes bug #573.
+
 1999-03-11  Jonathan Blandford  <jrb@redhat.com>
 
 	* gnome-file-property-dialog.c (create_settings_pane): change the
diff --git a/gnome/gdesktop.c b/gnome/gdesktop.c
index e22adf452..c67aff764 100644
--- a/gnome/gdesktop.c
+++ b/gnome/gdesktop.c
@@ -799,8 +799,11 @@ text_changed (GnomeIconTextItem *iti, gpointer data)
 	dest = g_concat_dir_and_file (desktop_directory, new_name);
 
 	if (mc_rename (source, dest) == 0) {
+		gnome_metadata_delete (dest);
+		gnome_metadata_rename (source, dest);
 		g_free (dii->filename);
 		dii->filename = g_strdup (new_name);
+		desktop_reload_icons (FALSE, 0, 0);
 		retval = TRUE;
 	} else
 		retval = FALSE; /* FIXME: maybe pop up a warning/query dialog? */
@@ -825,6 +828,7 @@ text_changed_url (GnomeIconTextItem *iti, gpointer data)
 	fullname = g_concat_dir_and_file (desktop_directory, dii->filename);
 	new_text = gnome_icon_text_item_get_text (iti);
 	gnome_metadata_set (fullname, "icon-caption", strlen (new_text) + 1, new_text);
+	desktop_reload_icons (FALSE, 0, 0);
 
 	return TRUE;
 }
diff --git a/po/mc.pot b/po/mc.pot
index fbe5932f1..6987d4b0d 100644
--- a/po/mc.pot
+++ b/po/mc.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-11 17:13-0500\n"
+"POT-Creation-Date: 1999-03-11 19:23-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Enter extra arguments:"
 msgstr ""
 
-#: gnome/gdesktop.c:420 gnome/gdesktop.c:2067
+#: gnome/gdesktop.c:420 gnome/gdesktop.c:2071
 msgid "Warning"
 msgstr ""
 
@@ -190,58 +190,58 @@ msgstr ""
 msgid "Could not open %s; will not have desktop icons"
 msgstr ""
 
-#: gnome/gdesktop.c:1009
+#: gnome/gdesktop.c:1013
 msgid "While running the mount/umount command"
 msgstr ""
 
-#: gnome/gdesktop.c:1078
+#: gnome/gdesktop.c:1082
 msgid "While running the eject command"
 msgstr ""
 
-#: gnome/gdesktop.c:1131 gnome/gicon.c:154 gnome/gtools.c:52
+#: gnome/gdesktop.c:1135 gnome/gicon.c:154 gnome/gtools.c:52
 msgid "Error"
 msgstr ""
 
 #. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:2063
+#: gnome/gdesktop.c:2067
 msgid "Home directory"
 msgstr ""
 
-#: gnome/gdesktop.c:2068
+#: gnome/gdesktop.c:2072
 #, c-format
 msgid "Could not symlink %s to %s; will not have initial desktop icons."
 msgstr ""
 
-#: gnome/gdesktop.c:2397 gnome/glayout.c:355
+#: gnome/gdesktop.c:2401 gnome/glayout.c:355
 msgid "_Terminal"
 msgstr ""
 
-#: gnome/gdesktop.c:2397 gnome/glayout.c:355
+#: gnome/gdesktop.c:2401 gnome/glayout.c:355
 msgid "Launch a new terminal in the current directory"
 msgstr ""
 
 #. If this ever changes, make sure you update create_new_menu accordingly.
-#: gnome/gdesktop.c:2399 gnome/glayout.c:357
+#: gnome/gdesktop.c:2403 gnome/glayout.c:357
 msgid "_Directory..."
 msgstr ""
 
-#: gnome/gdesktop.c:2399 gnome/glayout.c:357
+#: gnome/gdesktop.c:2403 gnome/glayout.c:357
 msgid "Creates a new directory"
 msgstr ""
 
-#: gnome/gdesktop.c:2407 gnome/glayout.c:440
+#: gnome/gdesktop.c:2411 gnome/glayout.c:440
 msgid "Arrange Icons"
 msgstr ""
 
-#: gnome/gdesktop.c:2408
+#: gnome/gdesktop.c:2412
 msgid "Create New Window"
 msgstr ""
 
-#: gnome/gdesktop.c:2410
+#: gnome/gdesktop.c:2414
 msgid "Rescan Mountable Devices"
 msgstr ""
 
-#: gnome/gdesktop.c:2411 gnome/glayout.c:443
+#: gnome/gdesktop.c:2415 gnome/glayout.c:443
 msgid "Rescan Desktop"
 msgstr ""