diff --git a/ChangeLog b/ChangeLog
index 0b4690093..58b4bda28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-10  Havoc Pennington  <hp@pobox.com>
+
+	* src/screen.c (meta_screen_new): oops, remove extra workspace
+	creation, and update to current pref.
+	
 2001-12-09  Havoc Pennington  <hp@pobox.com>
 
 	* src/workspace.c (meta_workspace_free): update number of
diff --git a/src/screen.c b/src/screen.c
index a04f39f63..5b7f655f5 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -220,13 +220,8 @@ meta_screen_new (MetaDisplay *display,
    * so create that required workspace.
    */
   screen->active_workspace = meta_workspace_new (screen);
-  /* FIXME, for now there are always 6 workspaces... */
-  meta_workspace_new (screen);
-  meta_workspace_new (screen);
-  meta_workspace_new (screen);
-  meta_workspace_new (screen);
-  meta_workspace_new (screen);
-
+  update_num_workspaces (screen);
+  
   meta_screen_grab_keys (screen);
 
   screen->ui = meta_ui_new (screen->display->xdisplay,