diff -ru usr/share/X11/xkb-old/rules/evdev usr/share/X11/xkb/rules/evdev
--- usr/share/X11/xkb-old/rules/evdev	2009-04-09 01:34:01.000000000 -0400
+++ usr/share/X11/xkb/rules/evdev	2009-06-10 17:26:40.000000000 -0400
@@ -856,6 +856,8 @@
   caps:swapescape	=	+capslock(swapescape)
   caps:escape		=	+capslock(escape)
   caps:backspace	=	+capslock(backspace)
+  caps:super_caps	=	+capslock(super_caps)
+  caps:hyper_caps	=	+capslock(hyper_caps)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:swapcaps		=	+ctrl(swapcaps)
   ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
diff -ru usr/share/X11/xkb-old/rules/evdev.lst usr/share/X11/xkb/rules/evdev.lst
--- usr/share/X11/xkb-old/rules/evdev.lst	2009-04-09 01:34:01.000000000 -0400
+++ usr/share/X11/xkb/rules/evdev.lst	2009-06-10 17:23:40.000000000 -0400
@@ -663,6 +663,8 @@
   caps:escape          Make CapsLock an additional ESC
   caps:backspace       Make CapsLock an additional Backspace
   caps:shiftlock       CapsLock toggles Shift so all keys are affected
+  caps:super_caps      CapsLock generates modifier Super
+  caps:hyper_caps      CapsLock generates modifier Hyper
   altwin               Alt/Win key behavior
   altwin:menu          Add the standard behavior to Menu key
   altwin:meta_alt      Alt and Meta are on Alt keys
diff -ru usr/share/X11/xkb-old/rules/evdev.xml usr/share/X11/xkb/rules/evdev.xml
--- usr/share/X11/xkb-old/rules/evdev.xml	2009-04-09 01:34:01.000000000 -0400
+++ usr/share/X11/xkb/rules/evdev.xml	2009-06-10 17:26:02.000000000 -0400
@@ -4591,6 +4591,18 @@
           <description>CapsLock toggles Shift so all keys are affected</description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>caps:super_caps</name>
+          <description>CapsLock generates modifier Super</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:hyper_caps</name>
+          <description>CapsLock generates modifier Hyper</description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="false">
       
@@ -4891,4 +4903,4 @@
       </option>
     </group>
   </optionList>
-</xkbConfigRegistry>
\ No newline at end of file
+</xkbConfigRegistry>
Only in usr/share/X11/xkb-old/symbols: .capslock.swp
diff -ru usr/share/X11/xkb-old/symbols/capslock usr/share/X11/xkb/symbols/capslock
--- usr/share/X11/xkb-old/symbols/capslock	2009-04-09 01:34:02.000000000 -0400
+++ usr/share/X11/xkb/symbols/capslock	2009-06-10 17:21:17.000000000 -0400
@@ -42,3 +42,15 @@
     key <CAPS> {        [       BackSpace  ]       };
 };
 
+partial modifier_keys
+xkb_symbols "super_caps" {
+    key <CAPS> { [ Super_L ] };
+    modifier_map Mod4 { Super_L };
+};
+
+
+partial modifier_keys
+xkb_symbols "hyper_caps" {
+    key <CAPS> { [ Hyper_L ] };
+    modifier_map Mod4 { Hyper_L };
+};
diff -ru usr/share/X11/xkb-old/symbols.dir usr/share/X11/xkb/symbols.dir
--- usr/share/X11/xkb-old/symbols.dir	2009-04-09 01:34:02.000000000 -0400
+++ usr/share/X11/xkb/symbols.dir	2009-06-10 17:27:21.000000000 -0400
@@ -844,6 +844,8 @@
 h-p----- -m------ capslock(groupshift)
 h-p----- -m------ capslock(escape)
 h-p----- -m------ capslock(backspace)
+--p----- -m------ capslock(super_caps)
+--p----- -m------ capslock(hyper_caps)
 -dp----- a------- mk(basic)
 --p----- a------- mk(nodeadkeys)
 -dp----- a------- uz(cyrillic)