diff -Naur ./rules/base /usr/share/X11/xkb//rules/base
--- ./rules/base	2011-11-08 16:32:01.152179606 -0500
+++ /usr/share/X11/xkb//rules/base	2011-11-08 16:50:43.992197458 -0500
@@ -1060,6 +1060,7 @@
   caps:super		=	+capslock(super)
   caps:hyper		=	+capslock(hyper)
   caps:none		=	+capslock(none)
+  caps:orca		=	+capslock(orca)
   caps:ctrl_modifier	=	+capslock(ctrl_modifier)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:lctrl_meta	=	+ctrl(lctrl_meta)
diff -Naur ./rules/base.lst /usr/share/X11/xkb//rules/base.lst
--- ./rules/base.lst	2011-11-08 16:32:01.152179606 -0500
+++ /usr/share/X11/xkb//rules/base.lst	2011-11-08 16:51:02.404197751 -0500
@@ -758,6 +758,7 @@
   caps:hyper           Make Caps Lock an additional Hyper
   caps:shiftlock       Caps Lock toggles Shift so all keys are affected
   caps:none            Caps Lock is disabled
+  caps:orca            Caps Lock set as Orca modifier key
   caps:ctrl_modifier   Make Caps Lock an additional Control but keep the Caps_Lock keysym
   altwin               Alt/Win key behavior
   altwin:menu          Add the standard behavior to Menu key
diff -Naur ./rules/base.xml /usr/share/X11/xkb//rules/base.xml
--- ./rules/base.xml	2011-11-08 16:32:01.172179606 -0500
+++ /usr/share/X11/xkb//rules/base.xml	2011-11-08 16:51:24.012198095 -0500
@@ -5850,6 +5850,12 @@
       </option>
       <option>
         <configItem>
+          <name>caps:orca</name>
+          <description>Caps Lock set as Orca modifier key</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>caps:ctrl_modifier</name>
           <description>Make Caps Lock an additional Control but keep the Caps_Lock keysym</description>
         </configItem>
@@ -6322,4 +6328,4 @@
       </option>
     </group>
   </optionList>
-</xkbConfigRegistry>
\ No newline at end of file
+</xkbConfigRegistry>
diff -Naur ./rules/evdev /usr/share/X11/xkb//rules/evdev
--- ./rules/evdev	2011-11-08 16:32:01.152179606 -0500
+++ /usr/share/X11/xkb//rules/evdev	2011-11-08 16:51:31.988198221 -0500
@@ -1000,6 +1000,7 @@
   caps:super		=	+capslock(super)
   caps:hyper		=	+capslock(hyper)
   caps:none		=	+capslock(none)
+  caps:orca		=	+capslock(orca)
   caps:ctrl_modifier	=	+capslock(ctrl_modifier)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:lctrl_meta	=	+ctrl(lctrl_meta)
diff -Naur ./rules/evdev.lst /usr/share/X11/xkb//rules/evdev.lst
--- ./rules/evdev.lst	2011-11-08 16:32:01.152179606 -0500
+++ /usr/share/X11/xkb//rules/evdev.lst	2011-11-08 16:51:45.824198440 -0500
@@ -758,6 +758,7 @@
   caps:hyper           Make Caps Lock an additional Hyper
   caps:shiftlock       Caps Lock toggles Shift so all keys are affected
   caps:none            Caps Lock is disabled
+  caps:orca            Caps Lock set as Orca modifier key
   caps:ctrl_modifier   Make Caps Lock an additional Control but keep the Caps_Lock keysym
   altwin               Alt/Win key behavior
   altwin:menu          Add the standard behavior to Menu key
diff -Naur ./rules/evdev.xml /usr/share/X11/xkb//rules/evdev.xml
--- ./rules/evdev.xml	2011-11-08 16:32:01.172179606 -0500
+++ /usr/share/X11/xkb//rules/evdev.xml	2011-11-08 16:52:01.720198694 -0500
@@ -5850,6 +5850,12 @@
       </option>
       <option>
         <configItem>
+          <name>caps:orca</name>
+          <description>Caps Lock set as Orca modifier key</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>caps:ctrl_modifier</name>
           <description>Make Caps Lock an additional Control but keep the Caps_Lock keysym</description>
         </configItem>
@@ -6322,4 +6328,4 @@
       </option>
     </group>
   </optionList>
-</xkbConfigRegistry>
\ No newline at end of file
+</xkbConfigRegistry>
diff -Naur ./rules/xfree86 /usr/share/X11/xkb//rules/xfree86
--- ./rules/xfree86	2011-11-08 16:32:01.152179606 -0500
+++ /usr/share/X11/xkb//rules/xfree86	2011-11-08 16:50:43.992197458 -0500
@@ -1060,6 +1060,7 @@
   caps:super		=	+capslock(super)
   caps:hyper		=	+capslock(hyper)
   caps:none		=	+capslock(none)
+  caps:orca		=	+capslock(orca)
   caps:ctrl_modifier	=	+capslock(ctrl_modifier)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:lctrl_meta	=	+ctrl(lctrl_meta)
diff -Naur ./rules/xfree86.lst /usr/share/X11/xkb//rules/xfree86.lst
--- ./rules/xfree86.lst	2011-11-08 16:32:01.152179606 -0500
+++ /usr/share/X11/xkb//rules/xfree86.lst	2011-11-08 16:51:02.404197751 -0500
@@ -758,6 +758,7 @@
   caps:hyper           Make Caps Lock an additional Hyper
   caps:shiftlock       Caps Lock toggles Shift so all keys are affected
   caps:none            Caps Lock is disabled
+  caps:orca            Caps Lock set as Orca modifier key
   caps:ctrl_modifier   Make Caps Lock an additional Control but keep the Caps_Lock keysym
   altwin               Alt/Win key behavior
   altwin:menu          Add the standard behavior to Menu key
diff -Naur ./rules/xfree86.xml /usr/share/X11/xkb//rules/xfree86.xml
--- ./rules/xfree86.xml	2011-11-08 16:32:01.172179606 -0500
+++ /usr/share/X11/xkb//rules/xfree86.xml	2011-11-08 16:51:24.012198095 -0500
@@ -5850,6 +5850,12 @@
       </option>
       <option>
         <configItem>
+          <name>caps:orca</name>
+          <description>Caps Lock set as Orca modifier key</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>caps:ctrl_modifier</name>
           <description>Make Caps Lock an additional Control but keep the Caps_Lock keysym</description>
         </configItem>
@@ -6322,4 +6328,4 @@
       </option>
     </group>
   </optionList>
-</xkbConfigRegistry>
\ No newline at end of file
+</xkbConfigRegistry>
diff -Naur ./rules/xorg /usr/share/X11/xkb//rules/xorg
--- ./rules/xorg	2011-11-08 16:32:01.152179606 -0500
+++ /usr/share/X11/xkb//rules/xorg	2011-11-08 16:50:43.992197458 -0500
@@ -1060,6 +1060,7 @@
   caps:super		=	+capslock(super)
   caps:hyper		=	+capslock(hyper)
   caps:none		=	+capslock(none)
+  caps:orca		=	+capslock(orca)
   caps:ctrl_modifier	=	+capslock(ctrl_modifier)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:lctrl_meta	=	+ctrl(lctrl_meta)
diff -Naur ./rules/xorg.lst /usr/share/X11/xkb//rules/xorg.lst
--- ./rules/xorg.lst	2011-11-08 16:32:01.152179606 -0500
+++ /usr/share/X11/xkb//rules/xorg.lst	2011-11-08 16:51:02.404197751 -0500
@@ -758,6 +758,7 @@
   caps:hyper           Make Caps Lock an additional Hyper
   caps:shiftlock       Caps Lock toggles Shift so all keys are affected
   caps:none            Caps Lock is disabled
+  caps:orca            Caps Lock set as Orca modifier key
   caps:ctrl_modifier   Make Caps Lock an additional Control but keep the Caps_Lock keysym
   altwin               Alt/Win key behavior
   altwin:menu          Add the standard behavior to Menu key
diff -Naur ./rules/xorg.xml /usr/share/X11/xkb//rules/xorg.xml
--- ./rules/xorg.xml	2011-11-08 16:32:01.172179606 -0500
+++ /usr/share/X11/xkb//rules/xorg.xml	2011-11-08 16:51:24.012198095 -0500
@@ -5850,6 +5850,12 @@
       </option>
       <option>
         <configItem>
+          <name>caps:orca</name>
+          <description>Caps Lock set as Orca modifier key</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>caps:ctrl_modifier</name>
           <description>Make Caps Lock an additional Control but keep the Caps_Lock keysym</description>
         </configItem>
@@ -6322,4 +6328,4 @@
       </option>
     </group>
   </optionList>
-</xkbConfigRegistry>
\ No newline at end of file
+</xkbConfigRegistry>
diff -Naur ./symbols/capslock /usr/share/X11/xkb//symbols/capslock
--- ./symbols/capslock	2011-11-08 16:32:01.696179616 -0500
+++ /usr/share/X11/xkb//symbols/capslock	2011-11-08 17:06:22.208212373 -0500
@@ -72,3 +72,14 @@
     };
     modifier_map Control { <CAPS> };
 };
+
+partial hidden modifier_keys
+xkb_symbols "orca" {
+    modifier_map Control { <CAPS> };
+    replace key <CAPS> {
+        type[Group1] = "ONE_LEVEL",
+        symbols[Group1] = [ Caps_Lock ],
+        actions[Group1] = [ SetMods(modifiers=Lock,clearLocks) ]
+    };
+};
+