diff -ur xkeyboard-config-1.2.orig/rules/base xkeyboard-config-1.2/rules/base
--- xkeyboard-config-1.2.orig/rules/base	2008-01-12 01:37:09.000000000 +0300
+++ xkeyboard-config-1.2/rules/base	2008-04-07 14:00:57.000000000 +0400
@@ -869,6 +869,7 @@
   grp:lctrl_lshift_toggle	=	+group(lctrl_lshift_toggle)
   grp:caps_toggle	=	+group(caps_toggle)
   grp:shift_caps_toggle	=	+group(shift_caps_toggle)
+  grp:shift_caps_switch	=	+group(shift_caps_switch)
   grp:alt_caps_toggle   =       +group(alt_caps_toggle)
   grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
   grp:alt_shift_toggle	=	+group(alt_shift_toggle)
diff -ur xkeyboard-config-1.2.orig/rules/base.lst xkeyboard-config-1.2/rules/base.lst
--- xkeyboard-config-1.2.orig/rules/base.lst	2008-01-30 00:54:02.000000000 +0300
+++ xkeyboard-config-1.2/rules/base.lst	2008-04-07 14:04:28.000000000 +0400
@@ -543,6 +543,7 @@
   grp:lalt_toggle      Left Alt key changes layout.
   grp:caps_toggle      CapsLock key changes layout.
   grp:shift_caps_toggle Shift+CapsLock changes layout.
+  grp:shift_caps_switch CapsLock switch to first layout, Shift+CapsLock switch to last layout.
   grp:alt_caps_toggle  Alt+CapsLock changes layout.
   grp:shifts_toggle    Both Shift keys together change layout.
   grp:alts_toggle      Both Alt keys together change layout.
diff -ur xkeyboard-config-1.2.orig/rules/base.o_s.part xkeyboard-config-1.2/rules/base.o_s.part
--- xkeyboard-config-1.2.orig/rules/base.o_s.part	2007-12-28 01:44:40.000000000 +0300
+++ xkeyboard-config-1.2/rules/base.o_s.part	2008-04-07 14:02:23.000000000 +0400
@@ -20,6 +20,7 @@
   grp:lctrl_lshift_toggle	=	+group(lctrl_lshift_toggle)
   grp:caps_toggle	=	+group(caps_toggle)
   grp:shift_caps_toggle	=	+group(shift_caps_toggle)
+  grp:shift_caps_switch	=	+group(shift_caps_switch)
   grp:alt_caps_toggle   =       +group(alt_caps_toggle)
   grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
   grp:alt_shift_toggle	=	+group(alt_shift_toggle)
diff -ur xkeyboard-config-1.2.orig/rules/base.xml.in xkeyboard-config-1.2/rules/base.xml.in
--- xkeyboard-config-1.2.orig/rules/base.xml.in	2008-01-08 02:08:25.000000000 +0300
+++ xkeyboard-config-1.2/rules/base.xml.in	2008-04-07 14:01:54.000000000 +0400
@@ -3610,6 +3610,12 @@
       </option>
       <option>
         <configItem>
+          <name>grp:shift_caps_switch</name>
+          <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>grp:alt_caps_toggle</name>
           <_description>Alt+CapsLock changes layout.</_description>
         </configItem>
diff -ur xkeyboard-config-1.2.orig/symbols/group xkeyboard-config-1.2/symbols/group
--- xkeyboard-config-1.2.orig/symbols/group	2008-01-25 02:21:06.000000000 +0300
+++ xkeyboard-config-1.2/symbols/group	2008-04-07 13:56:12.000000000 +0400
@@ -141,6 +141,14 @@
     key	<CAPS> {	[  Caps_Lock,		ISO_Next_Group	]	};
 };
 
+// using the group(shift_caps_switch) map, pressing:
+// Caps Lock selects the first group
+// Shift+Caps Lock selects the last group
+partial modifier_keys
+xkb_symbols "shift_caps_switch" {
+    key <CAPS> { [ ISO_First_Group, ISO_Last_Group ] };
+};
+
 // using the group(ctrl_alt_toggle) map, pressing:
 //     Control_L+Alt_L locks the previous group
 //     Control_R+Alt_R locks the next group
diff -ur xkeyboard-config-1.2.orig/symbols/symbols.dir xkeyboard-config-1.2/symbols/symbols.dir
--- xkeyboard-config-1.2.orig/symbols/symbols.dir	2007-06-26 11:54:26.000000000 +0400
+++ xkeyboard-config-1.2/symbols/symbols.dir	2008-04-07 14:04:52.000000000 +0400
@@ -461,6 +461,7 @@
 --p----- -m------ group(lctrl_lshift_toggle)
 --p----- -m------ group(caps_toggle)
 --p----- -m------ group(shift_caps_toggle)
+--p----- -m------ group(shift_caps_switch)
 --p----- -m------ group(ctrl_alt_toggle)
 --p----- -m------ group(alt_shift_toggle)
 --p----- -m------ group(menu_toggle)