diff -ur xkeyboard-config-1.3.orig/po/cs.po xkeyboard-config-1.3/po/cs.po
--- xkeyboard-config-1.3.orig/po/cs.po	2008-05-18 00:57:03.000000000 +0200
+++ xkeyboard-config-1.3/po/cs.po	2008-09-15 11:40:29.000000000 +0200
@@ -2585,3 +2585,11 @@
 #: ../rules/base.xml.in.h:646
 msgid "qwertz"
 msgstr "qwertz"
+
+#: ../rules/base.xml.in.h:647
+msgid "UCW layout (accented letters only)"
+msgstr "rozložení UCW (pouze akcentovaná písmena)"
+
+#: ../rules/base.xml.in.h:648
+msgid "CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action."
+msgstr "klávesa CapsLock přepne při stisknutí rozložení, Alt+CapsLock má původní význam capslock."
diff -ur xkeyboard-config-1.3.orig/rules/base.lst xkeyboard-config-1.3/rules/base.lst
--- xkeyboard-config-1.3.orig/rules/base.lst	2008-09-12 16:23:05.000000000 +0200
+++ xkeyboard-config-1.3/rules/base.lst	2008-09-15 11:22:06.000000000 +0200
@@ -331,6 +331,7 @@
   bksl            cz: With <\|> key
   qwerty          cz: qwerty
   qwerty_bksl     cz: qwerty, extended Backslash
+  ucw             cz: UCW layout (accented letters only)
   nodeadkeys      dk: Eliminate dead keys
   mac             dk: Macintosh
   mac_nodeadkeys  dk: Macintosh, eliminate dead keys
@@ -561,6 +562,7 @@
   grp:lwin_switch      Left Win-key switches layout while pressed.
   grp:rwin_switch      Right Win-key switches layout while pressed.
   grp:win_switch       Both Win-keys switch layout while pressed.
+  grp:caps_switch      CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.
   grp:rctrl_switch     Right Ctrl key switches layout while pressed.
   grp:toggle           Right Alt key changes layout.
   grp:lalt_toggle      Left Alt key changes layout.
@@ -624,6 +626,7 @@
   caps:capslock        CapsLock toggles normal capitalization of alphabetic characters.
   caps:swapescape      Swap ESC and CapsLock.
   caps:shiftlock       CapsLock toggles Shift so all keys are affected.
+  caps:groupshift      CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.
   altwin               Alt/Win key behavior
   altwin:menu          Add the standard behavior to Menu key.
   altwin:meta_alt      Alt and Meta are on the Alt keys.
diff -ur xkeyboard-config-1.3.orig/rules/base.o_s.part xkeyboard-config-1.3/rules/base.o_s.part
--- xkeyboard-config-1.3.orig/rules/base.o_s.part	2008-04-30 23:12:57.000000000 +0200
+++ xkeyboard-config-1.3/rules/base.o_s.part	2008-09-15 10:44:39.000000000 +0200
@@ -12,6 +12,7 @@
   grp:win_switch	=	+group(win_switch)
   grp:lwin_switch	=	+group(lwin_switch)
   grp:rwin_switch	=	+group(rwin_switch)
+  grp:caps_switch       =       +group(caps_switch)
   grp:toggle		=	+group(toggle)
   grp:shifts_toggle	=	+group(shifts_toggle)
   grp:ctrls_toggle	=	+group(ctrls_toggle)
@@ -46,6 +47,7 @@
   caps:shiftlock	=	+capslock(shiftlock)
   caps:grouplock	=	+capslock(grouplock)
   caps:swapescape	=	+capslock(swapescape)
+  caps:groupshift       =       +capslock(groupshift)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:swapcaps		=	+ctrl(swapcaps)
   ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
diff -ur xkeyboard-config-1.3.orig/rules/base.xml.in xkeyboard-config-1.3/rules/base.xml.in
--- xkeyboard-config-1.3.orig/rules/base.xml.in	2008-09-12 16:23:05.000000000 +0200
+++ xkeyboard-config-1.3/rules/base.xml.in	2008-09-15 11:36:34.000000000 +0200
@@ -1900,6 +1900,12 @@
             <_description>qwerty, extended Backslash</_description>
           </configItem>
         </variant>
+	<variant>
+	  <configItem>
+	    <name>ucw</name>
+	    <_description>UCW layout (accented letters only)</_description>
+	 </configItem>
+	</variant>
       </variantList>
     </layout>
     <layout>
@@ -3964,6 +3970,12 @@
         </configItem>
       </option>
       <option>
+         <configItem>
+           <name>grp:caps_switch</name>
+           <description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</description>
+         </configItem>
+       </option>
+       <option>
         <configItem>
           <name>grp:rctrl_switch</name>
           <_description>Right Ctrl key switches layout while pressed.</_description>
@@ -4364,6 +4377,12 @@
         </configItem>
       </option>
       <option>
+        <configItem>
+          <name>caps:groupshift</name>
+          <description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</description>
+        </configItem>
+      </option>
+      <option>
         <configItem>
           <name>caps:shiftlock</name>
           <_description>CapsLock toggles Shift so all keys are affected.</_description>
diff -ur xkeyboard-config-1.3.orig/rules/compat/base.l2_s.part xkeyboard-config-1.3/rules/compat/base.l2_s.part
--- xkeyboard-config-1.3.orig/rules/compat/base.l2_s.part	2008-05-10 01:17:53.000000000 +0200
+++ xkeyboard-config-1.3/rules/compat/base.l2_s.part	2008-09-15 11:03:47.000000000 +0200
@@ -3,6 +3,7 @@
   bs		=	+ba%(v[2]):2
   cs		=	+rs%(v[2]):2
   cz_qwerty		=	+cz(qwerty)%(v[2]):2
+  cz_ucw		=	+cz(ucw)%(v[2]):2
   dev		=	+in(deva)%(v[2]):2
   dvorak		=	+us(dvorak)%(v[2]):2
   dzdwi		=	+bt%(v[2]):2
diff -ur xkeyboard-config-1.3.orig/rules/compat/base.l3_s.part xkeyboard-config-1.3/rules/compat/base.l3_s.part
--- xkeyboard-config-1.3.orig/rules/compat/base.l3_s.part	2008-05-10 01:17:53.000000000 +0200
+++ xkeyboard-config-1.3/rules/compat/base.l3_s.part	2008-09-15 11:03:52.000000000 +0200
@@ -3,6 +3,7 @@
   bs		=	+ba%(v[3]):3
   cs		=	+rs%(v[3]):3
   cz_qwerty		=	+cz(qwerty)%(v[3]):3
+  cz_ucw		=	+cz(ucw)%(v[2]):2
   dev		=	+in(deva)%(v[3]):3
   dvorak		=	+us(dvorak)%(v[3]):3
   dzdwi		=	+bt%(v[3]):3
diff -ur xkeyboard-config-1.3.orig/rules/compat/base.l4_s.part xkeyboard-config-1.3/rules/compat/base.l4_s.part
--- xkeyboard-config-1.3.orig/rules/compat/base.l4_s.part	2008-05-10 01:17:53.000000000 +0200
+++ xkeyboard-config-1.3/rules/compat/base.l4_s.part	2008-09-15 11:03:56.000000000 +0200
@@ -3,6 +3,7 @@
   bs		=	+ba%(v[4]):4
   cs		=	+rs%(v[4]):4
   cz_qwerty		=	+cz(qwerty)%(v[4]):4
+  cz_ucw		=	+cz(ucw)%(v[2]):2
   dev		=	+in(deva)%(v[4]):4
   dvorak		=	+us(dvorak)%(v[4]):4
   dzdwi		=	+bt%(v[4]):4
diff -ur xkeyboard-config-1.3.orig/symbols/capslock xkeyboard-config-1.3/symbols/capslock
--- xkeyboard-config-1.3.orig/symbols/capslock	2007-12-27 23:47:04.000000000 +0100
+++ xkeyboard-config-1.3/symbols/capslock	2008-09-15 14:10:27.000000000 +0200
@@ -22,3 +22,12 @@
     key <CAPS> {        [       Escape  ]       };
     key <ESC>  {        [     Caps_Lock    ]       };
 };
+
+partial hidden modifier_keys
+xkb_symbols "groupshift" {
+    key <CAPS> {
+       type[Group1]="PC_ALT_LEVEL2",
+       [       Mode_switch,    Caps_Lock       ]
+    };
+};
+
diff -ur xkeyboard-config-1.3.orig/symbols/cz xkeyboard-config-1.3/symbols/cz
--- xkeyboard-config-1.3.orig/symbols/cz	2008-02-16 01:53:45.000000000 +0100
+++ xkeyboard-config-1.3/symbols/cz	2008-09-15 14:08:37.000000000 +0200
@@ -103,3 +103,42 @@
 
     key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
 };
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "ucw" {
+
+    // This layout is usually used as the second group, it contains
+    // accented characters only, no 'latin' set.
+    // 2008 by Milan Vancura <mvancura@suse.cz>
+
+    name[Group1]= "Czechia - ucw";
+
+    key <AD01> { [adiaeresis,  Adiaeresis  ] };
+    key <AD02> { [ecaron,      Ecaron      ] };
+    key <AD03> { [eacute,      Eacute      ] };
+    key <AD04> { [rcaron,      Rcaron      ] };
+    key <AD05> { [tcaron,      Tcaron      ] };
+    key <AD06> { [yacute,      Yacute      ] };
+    key <AD07> { [uring,       Uring       ] };
+    key <AD08> { [iacute,      Iacute      ] };
+    key <AD09> { [oacute,      Oacute      ] };
+    key <AD10> { [odiaeresis,  Odiaeresis  ] };
+
+    key <AC01> { [aacute,      Aacute      ] };
+    key <AC02> { [scaron,      Scaron      ] };
+    key <AC03> { [dcaron,      Dcaron      ] };
+    key <AC04> { [ediaeresis,  Ediaeresis  ] };
+    key <AC05> { [racute,      Racute      ] };
+    key <AC06> { [uacute,      Uacute      ] };
+    key <AC07> { [udiaeresis,  Udiaeresis  ] };
+    key <AC08> { [ocircumflex, Ocircumflex ] };
+    key <AC09> { [lcaron,      Lcaron      ] };
+
+    key <AB01> { [zcaron,      Zcaron      ] };
+    key <AB02> { [ssharp                   ] };
+    key <AB03> { [ccaron,      Ccaron      ] };
+    key <AB04> { [ccedilla,    Ccedilla    ] };
+    key <AB05> { [ntilde,      Ntilde      ] };
+    key <AB06> { [ncaron,      Ncaron      ] };
+    key <AB07> { [lacute,      Lacute      ] };
+};
diff -ur xkeyboard-config-1.3.orig/symbols/group xkeyboard-config-1.3/symbols/group
--- xkeyboard-config-1.3.orig/symbols/group	2008-09-12 16:23:05.000000000 +0200
+++ xkeyboard-config-1.3/symbols/group	2008-09-15 11:56:19.000000000 +0200
@@ -134,6 +134,16 @@
     include "capslock(grouplock)"
 };
 
+// using the group(caps_switch) map, pressing:
+//     Caps Lock  key temporarily chooses the second keyboard group
+//                (until it is released)
+//     Alt+Caps Lock toggles caps lock
+partial modifier_keys
+xkb_symbols "caps_switch" {
+    include "capslock(groupshift)"
+};
+
+
 // using the group(shift_caps_toggle) map, pressing:
 //     Shift+Caps Lock toggles group
 partial modifier_keys