diff -ur -x '.git*' xkeyboard-config/po/cs.po xkeyboard-config.ucw/po/cs.po
--- xkeyboard-config/po/cs.po	2008-09-15 17:06:57.000000000 +0200
+++ xkeyboard-config.ucw/po/cs.po	2008-09-15 17:11:35.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 -x '.git*' xkeyboard-config/rules/base.o_s.part xkeyboard-config.ucw/rules/base.o_s.part
--- xkeyboard-config/rules/base.o_s.part	2008-09-15 17:06:58.000000000 +0200
+++ xkeyboard-config.ucw/rules/base.o_s.part	2008-09-15 17:06:08.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 -x '.git*' xkeyboard-config/rules/base.xml.in xkeyboard-config.ucw/rules/base.xml.in
--- xkeyboard-config/rules/base.xml.in	2008-09-15 17:06:58.000000000 +0200
+++ xkeyboard-config.ucw/rules/base.xml.in	2008-09-15 17:06:08.000000000 +0200
@@ -1922,6 +1922,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>
@@ -4012,6 +4018,12 @@
       </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>
         </configItem>
@@ -4415,6 +4427,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 -x '.git*' xkeyboard-config/rules/compat/layoutRename.lst xkeyboard-config.ucw/rules/compat/layoutRename.lst
--- xkeyboard-config/rules/compat/layoutRename.lst	2008-09-15 17:06:58.000000000 +0200
+++ xkeyboard-config.ucw/rules/compat/layoutRename.lst	2008-09-15 17:06:08.000000000 +0200
@@ -3,6 +3,7 @@
 bs	ba
 cs	rs
 cz_qwerty cz(qwerty)
+cz_ucw cz(ucw)
 dev	in(deva)
 dvorak	us(dvorak)
 dzdwi	bt
diff -ur -x '.git*' xkeyboard-config/symbols/capslock xkeyboard-config.ucw/symbols/capslock
--- xkeyboard-config/symbols/capslock	2008-09-15 17:06:58.000000000 +0200
+++ xkeyboard-config.ucw/symbols/capslock	2008-09-15 17:06:08.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 -x '.git*' xkeyboard-config/symbols/cz xkeyboard-config.ucw/symbols/cz
--- xkeyboard-config/symbols/cz	2008-09-15 17:06:58.000000000 +0200
+++ xkeyboard-config.ucw/symbols/cz	2008-09-15 17:06:08.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 <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      ] };
+
+    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 <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  ] };
+};
diff -ur -x '.git*' xkeyboard-config/symbols/group xkeyboard-config.ucw/symbols/group
--- xkeyboard-config/symbols/group	2008-09-15 17:06:58.000000000 +0200
+++ xkeyboard-config.ucw/symbols/group	2008-09-15 17:06:08.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