diff --git a/ChangeLog b/ChangeLog
index 72a7c206a..52a0aebc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-10  Havoc Pennington  <hp@pobox.com>
+
+	* src/keybindings.c (reload_modmap): put LockMask into the
+	ignored_modifier_mask so that caps lock doesn't mess up 
+	keybindings.
+
 2002-05-10  Havoc Pennington  <hp@pobox.com>
 
 	* src/window.c (meta_window_focus): if window is not mapped after
diff --git a/src/keybindings.c b/src/keybindings.c
index 9250fb557..8b4096413 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -290,7 +290,8 @@ reload_modmap (MetaDisplay *display)
     }
 
   display->ignored_modifier_mask = (display->num_lock_mask |
-                                    display->scroll_lock_mask);
+                                    display->scroll_lock_mask |
+                                    LockMask);
 
   meta_topic (META_DEBUG_KEYBINDINGS,
               "Ignoring modmask 0x%x num lock 0x%x scroll lock 0x%x\n",