diff --git a/ChangeLog b/ChangeLog
index f8d6681ce..cd41490c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-22  Björn Lindqvist  <bjourne@gmail.com>
+
+	* common.h (enum MetaCursor):
+	* display.c (meta_display_create_x_cursor): Make mouse cursor when
+	moving windows become a hand. Fixes #337376.
+ 
 2006-05-19  Björn Lindqvist  <bjourne@gmail.com>
 
 	* frames.c: Fix a logic bug so that the whole titlebar becomes
diff --git a/src/common.h b/src/common.h
index 24f208db2..2b3f4e3a3 100644
--- a/src/common.h
+++ b/src/common.h
@@ -143,8 +143,7 @@ typedef enum
   META_CURSOR_SW_RESIZE,
   META_CURSOR_NE_RESIZE,
   META_CURSOR_NW_RESIZE,
-  META_CURSOR_MOVE_WINDOW,
-  META_CURSOR_RESIZE_WINDOW,
+  META_CURSOR_MOVE_OR_RESIZE_WINDOW,
   META_CURSOR_BUSY
 
 } MetaCursor;
diff --git a/src/display.c b/src/display.c
index 050d8d67f..40a79b284 100644
--- a/src/display.c
+++ b/src/display.c
@@ -3064,10 +3064,7 @@ meta_display_create_x_cursor (MetaDisplay *display,
     case META_CURSOR_NW_RESIZE:
       glyph = XC_top_left_corner;
       break;
-    case META_CURSOR_MOVE_WINDOW:
-      glyph = XC_plus;
-      break;
-    case META_CURSOR_RESIZE_WINDOW:
+    case META_CURSOR_MOVE_OR_RESIZE_WINDOW:
       glyph = XC_fleur;
       break;
     case META_CURSOR_BUSY:
@@ -3127,10 +3124,8 @@ xcursor_for_op (MetaDisplay *display,
       break;
     case META_GRAB_OP_MOVING:
     case META_GRAB_OP_KEYBOARD_MOVING:
-      cursor = META_CURSOR_MOVE_WINDOW;
-      break;
     case META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN:
-      cursor = META_CURSOR_RESIZE_WINDOW;
+      cursor = META_CURSOR_MOVE_OR_RESIZE_WINDOW;
       break;
       
     default: