diff --git a/ChangeLog b/ChangeLog
index e99e77237..78b496161 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2002-05-07  Anders Carlsson  <andersca@gnu.org>
+
+	* src/display.c: (meta_display_open), (event_callback),
+	(meta_display_update_show_desktop_hint):
+	* src/display.h:
+	* src/screen.c: (set_supported_hint):
+	Fix atom name; it's _NET_SHOW_DESKTOP, not 
+	_NET_WM_SHOW_DESKTOP.
+	
+	* src/frames.c: (meta_frames_unmanage_window):
+	Restore the mouse cursor to default when unmanaging a window.
+	
 2002-05-06  Anders Carlsson  <andersca@gnu.org>
 
 	* src/display.c: (set_utf8_string_hint):
@@ -8,7 +20,7 @@
 	(meta_display_show_desktop), (meta_display_unshow_desktop):
 	* src/display.h:
 	* src/screen.c: (set_supported_hint):
-	Add support for _NET_WM_SHOW desktop, both as a message and
+	Add support for _NET_WM_SHOW_DESKTOP, both as a message and
 	as a root window property.
 	
 2002-05-05  Havoc Pennington  <hp@pobox.com>
diff --git a/src/display.c b/src/display.c
index 188c44a11..c707fc203 100644
--- a/src/display.c
+++ b/src/display.c
@@ -206,7 +206,7 @@ meta_display_open (const char *name)
     "_NET_WM_PID",
     "WM_CLIENT_MACHINE",
     "_NET_WM_WORKAREA",
-    "_NET_WM_SHOW_DESKTOP"
+    "_NET_SHOW_DESKTOP"
   };
   Atom atoms[G_N_ELEMENTS(atom_names)];
   
@@ -314,7 +314,7 @@ meta_display_open (const char *name)
   display->atom_net_wm_pid = atoms[54];
   display->atom_wm_client_machine = atoms[55];
   display->atom_net_wm_workarea = atoms[56];
-  display->atom_net_wm_show_desktop = atoms[57];
+  display->atom_net_show_desktop = atoms[57];
   
   /* Offscreen unmapped window used for _NET_SUPPORTING_WM_CHECK,
    * created in screen_new
@@ -1267,7 +1267,7 @@ event_callback (XEvent   *event,
                   meta_prefs_set_num_workspaces (num_spaces);
                 }
 	      else if (event->xclient.message_type ==
-		       display->atom_net_wm_show_desktop)
+		       display->atom_net_show_desktop)
 		{
 		  gboolean show_desktop;
 
@@ -2299,7 +2299,7 @@ meta_display_update_show_desktop_hint (MetaDisplay *display)
       
       meta_error_trap_push (display);
       XChangeProperty (display->xdisplay, screen->xroot,
-                       display->atom_net_wm_show_desktop,
+                       display->atom_net_show_desktop,
                        XA_CARDINAL,
                        32, PropModeReplace, (guchar*) data, 1);
       meta_error_trap_pop (display);
diff --git a/src/display.h b/src/display.h
index 9ced5bccb..10a2fbf6c 100644
--- a/src/display.h
+++ b/src/display.h
@@ -129,7 +129,7 @@ struct _MetaDisplay
   Atom atom_wm_client_machine;
   Atom atom_net_wm_state_fullscreen;
   Atom atom_net_wm_workarea;
-  Atom atom_net_wm_show_desktop;
+  Atom atom_net_show_desktop;
   
   /* This is the actual window from focus events,
    * not the one we last set
diff --git a/src/frames.c b/src/frames.c
index aadb86bbb..e98a8909b 100644
--- a/src/frames.c
+++ b/src/frames.c
@@ -450,7 +450,12 @@ meta_frames_unmanage_window (MetaFrames *frames,
   frame = g_hash_table_lookup (frames->frames, &xwindow);
 
   if (frame)
-    {      
+    {
+      /* restore the cursor */
+      meta_core_set_screen_cursor (gdk_display,
+				   frame->xwindow,
+				   META_CURSOR_DEFAULT);
+
       gdk_window_set_user_data (frame->window, NULL);
 
       if (frames->last_motion_frame == frame)
diff --git a/src/screen.c b/src/screen.c
index e9a281f97..98c7a4257 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -116,7 +116,7 @@ set_supported_hint (MetaScreen *screen)
   atoms[27] = screen->display->atom_net_wm_ping;
   atoms[28] = screen->display->atom_net_active_window;
   atoms[29] = screen->display->atom_net_wm_workarea;
-  atoms[30] = screen->display->atom_net_wm_show_desktop;
+  atoms[30] = screen->display->atom_net_show_desktop;
   
   XChangeProperty (screen->display->xdisplay, screen->xroot,
                    screen->display->atom_net_supported,