diff -NarU5 xkeyboard-config-2.1.orig/rules/base.xml.in xkeyboard-config-2.1/rules/base.xml.in
--- xkeyboard-config-2.1.orig/rules/base.xml.in	2011-01-11 19:14:44.000000000 -0500
+++ xkeyboard-config-2.1/rules/base.xml.in	2011-02-22 11:02:13.506502114 -0500
@@ -3459,10 +3459,16 @@
             <_description>Cedilla</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
+            <name>touchtype</name>
+            <_description>TouchType</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>std</name>
             <_description>Standard</_description>
           </configItem>
         </variant>
         <variant>
diff -NarU5 xkeyboard-config-2.1.orig/rules/evdev.xml.in xkeyboard-config-2.1/rules/evdev.xml.in
--- xkeyboard-config-2.1.orig/rules/evdev.xml.in	2011-01-11 19:16:50.000000000 -0500
+++ xkeyboard-config-2.1/rules/evdev.xml.in	2011-02-22 11:02:51.348152253 -0500
@@ -3459,10 +3459,16 @@
             <_description>Cedilla</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
+            <name>touchtype</name>
+            <_description>TouchType</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>std</name>
             <_description>Standard</_description>
           </configItem>
         </variant>
         <variant>
diff -NarU5 xkeyboard-config-2.1.orig/symbols/ro xkeyboard-config-2.1/symbols/ro
--- xkeyboard-config-2.1.orig/symbols/ro	2009-05-11 05:12:50.000000000 -0400
+++ xkeyboard-config-2.1/symbols/ro	2011-02-22 11:01:22.862601275 -0500
@@ -74,10 +74,29 @@
     key <AD05> { [ t,                      T,  tcedilla,	 Tcedilla ] };
     key <AC02> { [ s,                      S,  scedilla,	 Scedilla ] };
 };
 
 partial alphanumeric_keys
+xkb_symbols "touchtype" {
+    // This layout is optimized for fast touch-typing in Romanian on a
+    // US keyboard, and works by swapping out symbols infrequently used
+    // in written Romanian (q,w,y,k) in favor of native ones, thus reducing
+    // the need to use modifier keys.
+    // Created by Gabriel Somlo, <somlo@cmu.edu> (C) 2011
+
+    include "ro(basic)"
+
+    name[Group1]="Romania - TouchType";
+
+    key <AD01> { [ abreve,            Abreve,  q,                       Q ] };
+    key <AD02> { [ 0x1000219,      0x1000218,  w,                       W ] };
+    key <AD06> { [ 0x100021b,      0x100021a,  y,                       Y ] };
+    key <AC01> { [ a,                      A,  acircumflex,   Acircumflex ] };
+    key <AC08> { [ icircumflex,  Icircumflex,  k,                       K ] };
+};
+
+partial alphanumeric_keys
 xkb_symbols "std" {
     // Primary layout in the new Romanian standard.
     // Implemented here as a variant because of the lack of hardware 
     // Romanian keyboards and because of the predilection of Romanian
     // X users towards the secondary layout from the new standard.