--- /usr/share/X11/xkb/rules/base.save	2010-01-17 06:39:08.000000000 +0100
+++ /usr/share/X11/xkb/rules/base	2010-01-17 16:50:17.000000000 +0100
@@ -331,6 +331,7 @@
   *		ben(basic)			=	pc+in(ben)
   *		ben(probhat)			=	pc+in(ben_probhat)
   *		dev(basic)			=	pc+in(deva)
+  *		dvorak			=	pc+us(dvorak)
   *		dvorak($dvoraklayouts)			=	pc+%v(dvorak)
   *		dvorak(basic)			=	pc+us(dvorak)
   *		dvorak(pl_basic)			=	pc+pl(dvorak)
@@ -453,6 +454,7 @@
   ben(basic)	=	+in(ben):2
   ben(probhat)	=	+in(ben_probhat):2
   dev(basic)	=	+in(deva):2
+  dvorak	=	+us(dvorak):2
   dvorak($dvoraklayouts)	=	+%v(dvorak):2
   dvorak(basic)	=	+us(dvorak):2
   dvorak(pl_basic)	=	+pl(dvorak):2
@@ -499,7 +501,7 @@
   yu(unicode)	=	+srp(latinunicode):2
   yu(yz)	=	+srp(latinyz):2
   yu(unicodeyz)	=	+srp(latinunicodeyz):2
-  *		=	+%l[2]%(v[2]):2
+  *		=	+%l[2](basic):2
 
 ! layout[3]	=	symbols
   ar		=	+ara%(v[3]):3
@@ -515,6 +517,7 @@
   ben(basic)	=	+in(ben):3
   ben(probhat)	=	+in(ben_probhat):3
   dev(basic)	=	+in(deva):3
+  dvorak	=	+us(dvorak):3
   dvorak($dvoraklayouts)	=	+%v(dvorak):3
   dvorak(basic)	=	+us(dvorak):3
   dvorak(pl_basic)	=	+pl(dvorak):3
@@ -561,7 +564,7 @@
   yu(unicode)	=	+srp(latinunicode):3
   yu(yz)	=	+srp(latinyz):3
   yu(unicodeyz)	=	+srp(latinunicodeyz):3
-  *		=	+%l[3]%(v[3]):3
+  *		=	+%l[3](basic):3
 
 ! layout[4]	=	symbols
   ar		=	+ara%(v[4]):4
@@ -577,6 +580,7 @@
   ben(basic)	=	+in(ben):4
   ben(probhat)	=	+in(ben_probhat):4
   dev(basic)	=	+in(deva):4
+  dvorak	=	+us(dvorak):4
   dvorak($dvoraklayouts)	=	+%v(dvorak):4
   dvorak(basic)	=	+us(dvorak):4
   dvorak(pl_basic)	=	+pl(dvorak):4
@@ -623,7 +627,7 @@
   yu(unicode)	=	+srp(latinunicode):4
   yu(yz)	=	+srp(latinyz):4
   yu(unicodeyz)	=	+srp(latinunicodeyz):4
-  *		=	+%l[4]%(v[4]):4
+  *		=	+%l[4](basic):4
 
 ! layout[2]	variant[2]	=	symbols
   ben		basic	=	+in(ben):2