diff --git a/ChangeLog b/ChangeLog
index 95488cb930..03be98bcb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-01  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkkeys-win32.c (gdk_keymap_get_caps_lock_state):
+	Implement trivially on Windows. Not sure if something more complex
+	is actually needed, more specifically whether the function needs
+	to differentiate between "Caps Lock" and "Shift Lock" semantics?
+
 2008-10-01  Simos Xenitellis  <simos@gnome.org>
 
 	Bug 554506 – combining diacritics broken, became deadkeys
diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c
index e86ea97061..30cb7316d3 100644
--- a/gdk/win32/gdkkeys-win32.c
+++ b/gdk/win32/gdkkeys-win32.c
@@ -530,6 +530,12 @@ gdk_keymap_have_bidi_layouts (GdkKeymap *keymap)
   return FALSE;
 }
 
+gboolean
+gdk_keymap_get_caps_lock_state (GdkKeymap *keymap)
+{
+  return ((GetKeyState (VK_CAPITAL) & 1) != 0);
+}
+
 gboolean
 gdk_keymap_get_entries_for_keyval (GdkKeymap     *keymap,
                                    guint          keyval,