diff --git a/ChangeLog b/ChangeLog
index 04b3c62..1f93f10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-23  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/x11/XGServerEvent.m (process_modifier_flags()) treat caps
+	lock as alpha shift and not as shift modifier. 
+
 2003-11-20  Adam Fedor  <fedor@gnu.org>
 
 	* Source/xlib/XGBitmap.m (_pixmap_combine_alpha): Use RGetClosestXColor
diff --git a/Source/x11/XGServerEvent.m b/Source/x11/XGServerEvent.m
index e601bd7..41f5abe 100644
--- a/Source/x11/XGServerEvent.m
+++ b/Source/x11/XGServerEvent.m
@@ -1748,7 +1748,7 @@ process_modifier_flags(unsigned int state)
     eventModifierFlags = eventModifierFlags | NSShiftKeyMask;
 
   if (state & LockMask)
-    eventModifierFlags = eventModifierFlags | NSShiftKeyMask;
+    eventModifierFlags = eventModifierFlags | NSAlphaShiftKeyMask;
 
   if (_control_pressed != 0)
     eventModifierFlags = eventModifierFlags | NSControlKeyMask;