diff -Nru metacity-2.30.3/debian/changelog metacity-2.30.3/debian/changelog
--- metacity-2.30.3/debian/changelog	2011-02-23 16:28:11.000000000 +0000
+++ metacity-2.30.3/debian/changelog	2011-03-06 12:57:02.000000000 +0000
@@ -1,3 +1,10 @@
+metacity (1:2.30.3-0ubuntu5) natty; urgency=low
+
+  * debian/patches/18_initialise_all_workspace_names.patch
+    Added patch from upstream. (Closes LP: #583847)
+
+ -- Jan Brinkmann <lucky@the-luckyduck.de>  Sun, 06 Mar 2011 12:54:45 +0000
+
 metacity (1:2.30.3-0ubuntu4) natty; urgency=low
 
   [ Bill Filler ]
diff -Nru metacity-2.30.3/debian/patches/18_initialise_all_workspace_names.patch metacity-2.30.3/debian/patches/18_initialise_all_workspace_names.patch
--- metacity-2.30.3/debian/patches/18_initialise_all_workspace_names.patch	1970-01-01 00:00:00.000000000 +0000
+++ metacity-2.30.3/debian/patches/18_initialise_all_workspace_names.patch	2011-03-06 12:42:15.000000000 +0000
@@ -0,0 +1,35 @@
+Index: metacity-2.30.3/src/core/prefs.c
+===================================================================
+--- metacity-2.30.3.orig/src/core/prefs.c	2011-03-06 12:39:52.231622002 +0000
++++ metacity-2.30.3/src/core/prefs.c	2011-03-06 12:42:05.811621999 +0000
+@@ -1974,6 +1974,10 @@
+ static void
+ init_workspace_names (void)
+ {
++  int i;
++  for (i = 0; i < MAX_REASONABLE_WORKSPACES; i++)
++    workspace_names[i] = NULL;
++
+ #ifdef HAVE_GCONF
+   GSList *list, *l;
+   const char *str_val;
+@@ -1992,14 +1996,15 @@
+       gconf_entry_free (entry);
+     }
+   g_slist_free (list);
+-#else
+-  int i;
++#endif /* HAVE_GCONF */
++
++  /* initialise any we didn't see */
+   for (i = 0; i < MAX_REASONABLE_WORKSPACES; i++)
+-    workspace_names[i] = g_strdup_printf (_("Workspace %d"), i + 1);
++    if (workspace_names[i]==NULL)
++      workspace_names[i] = g_strdup_printf (_("Workspace %d"), i + 1);
+ 
+   meta_topic (META_DEBUG_PREFS,
+               "Initialized workspace names\n");
+-#endif /* HAVE_GCONF */
+ }
+ 
+ static gboolean
diff -Nru metacity-2.30.3/debian/patches/series metacity-2.30.3/debian/patches/series
--- metacity-2.30.3/debian/patches/series	2011-02-23 16:20:27.000000000 +0000
+++ metacity-2.30.3/debian/patches/series	2011-03-06 12:39:43.000000000 +0000
@@ -13,3 +13,4 @@
 16-capture-before-unmap.patch
 17-workspace-switcher-cycle.patch
 99_ltmain_as-needed.patch
+18_initialise_all_workspace_names.patch