diff --git a/ChangeLog b/ChangeLog
index 29cd5cb42b..c0a387a9d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-01-27  Anders Carlsson  <andersca@gnu.org>
 
+	* gtk/gtklabel.c (gtk_label_create_window): Set the cursor to
+	GDK_XTERM.
+
 	* gtk/gtktextview.h (struct _GtkTextView): add mouse_cursor_obscured.
 
 	* gtk/gtkentry.h (struct _GtkEntry): Add mouse_cursor_obscured.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 29cd5cb42b..c0a387a9d3 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,8 @@
 2002-01-27  Anders Carlsson  <andersca@gnu.org>
 
+	* gtk/gtklabel.c (gtk_label_create_window): Set the cursor to
+	GDK_XTERM.
+
 	* gtk/gtktextview.h (struct _GtkTextView): add mouse_cursor_obscured.
 
 	* gtk/gtkentry.h (struct _GtkEntry): Add mouse_cursor_obscured.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 29cd5cb42b..c0a387a9d3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2002-01-27  Anders Carlsson  <andersca@gnu.org>
 
+	* gtk/gtklabel.c (gtk_label_create_window): Set the cursor to
+	GDK_XTERM.
+
 	* gtk/gtktextview.h (struct _GtkTextView): add mouse_cursor_obscured.
 
 	* gtk/gtkentry.h (struct _GtkEntry): Add mouse_cursor_obscured.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 29cd5cb42b..c0a387a9d3 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,8 @@
 2002-01-27  Anders Carlsson  <andersca@gnu.org>
 
+	* gtk/gtklabel.c (gtk_label_create_window): Set the cursor to
+	GDK_XTERM.
+
 	* gtk/gtktextview.h (struct _GtkTextView): add mouse_cursor_obscured.
 
 	* gtk/gtkentry.h (struct _GtkEntry): Add mouse_cursor_obscured.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 29cd5cb42b..c0a387a9d3 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,8 @@
 2002-01-27  Anders Carlsson  <andersca@gnu.org>
 
+	* gtk/gtklabel.c (gtk_label_create_window): Set the cursor to
+	GDK_XTERM.
+
 	* gtk/gtktextview.h (struct _GtkTextView): add mouse_cursor_obscured.
 
 	* gtk/gtkentry.h (struct _GtkEntry): Add mouse_cursor_obscured.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 29cd5cb42b..c0a387a9d3 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2002-01-27  Anders Carlsson  <andersca@gnu.org>
 
+	* gtk/gtklabel.c (gtk_label_create_window): Set the cursor to
+	GDK_XTERM.
+
 	* gtk/gtktextview.h (struct _GtkTextView): add mouse_cursor_obscured.
 
 	* gtk/gtkentry.h (struct _GtkEntry): Add mouse_cursor_obscured.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 29cd5cb42b..c0a387a9d3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2002-01-27  Anders Carlsson  <andersca@gnu.org>
 
+	* gtk/gtklabel.c (gtk_label_create_window): Set the cursor to
+	GDK_XTERM.
+
 	* gtk/gtktextview.h (struct _GtkTextView): add mouse_cursor_obscured.
 
 	* gtk/gtkentry.h (struct _GtkEntry): Add mouse_cursor_obscured.
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 9940f0d8fd..f648f2d342 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2275,16 +2275,19 @@ gtk_label_create_window (GtkLabel *label)
   attributes.window_type = GDK_WINDOW_TEMP;
   attributes.wclass = GDK_INPUT_ONLY;
   attributes.override_redirect = TRUE;
+  attributes.cursor = gdk_cursor_new (GDK_XTERM);
   attributes.event_mask = gtk_widget_get_events (widget) |
     GDK_BUTTON_PRESS_MASK        |
     GDK_BUTTON_RELEASE_MASK      |
     GDK_BUTTON_MOTION_MASK;
 
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR | GDK_WA_CURSOR;
 
   label->select_info->window = gdk_window_new (widget->window,
                                                &attributes, attributes_mask);
-  gdk_window_set_user_data (label->select_info->window, widget);  
+  gdk_window_set_user_data (label->select_info->window, widget);
+
+  gdk_cursor_unref (attributes.cursor);
 }
 
 static void