diff --git a/ChangeLog b/ChangeLog
index 4a7f280af6..5bdef49e39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap): Workaround for bug in
+	MapVirtualKey(VK_DIVIDE, 0) in some Windows versions. (#142998)
+
 Tue Feb 22 13:49:09 2005  Manish Singh  <yosh@gimp.org>
 
 	* gtk/updateiconcache.c: #include <config.h>
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4a7f280af6..5bdef49e39 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-02-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap): Workaround for bug in
+	MapVirtualKey(VK_DIVIDE, 0) in some Windows versions. (#142998)
+
 Tue Feb 22 13:49:09 2005  Manish Singh  <yosh@gimp.org>
 
 	* gtk/updateiconcache.c: #include <config.h>
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4a7f280af6..5bdef49e39 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-02-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (update_keymap): Workaround for bug in
+	MapVirtualKey(VK_DIVIDE, 0) in some Windows versions. (#142998)
+
 Tue Feb 22 13:49:09 2005  Manish Singh  <yosh@gimp.org>
 
 	* gtk/updateiconcache.c: #include <config.h>
diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c
index f3fcb35bdf..c6d051de83 100644
--- a/gdk/win32/gdkkeys-win32.c
+++ b/gdk/win32/gdkkeys-win32.c
@@ -347,7 +347,8 @@ update_keymap (void)
 
   for (vk = 0; vk < 256; vk++)
     {
-      if ((scancode = MapVirtualKey (vk, 0)) == 0)
+      if ((scancode = MapVirtualKey (vk, 0)) == 0 &&
+	  vk != VK_DIVIDE)
 	keysym_tab[vk*4+0] =
 	  keysym_tab[vk*4+1] =
 	  keysym_tab[vk*4+2] =