diff -ruN xkeyboard-config-1.0.orig/rules/base.o_s.part xkeyboard-config-1.0/rules/base.o_s.part
--- xkeyboard-config-1.0.orig/rules/base.o_s.part	2007-12-27 08:13:32.000000000 -0200
+++ xkeyboard-config-1.0/rules/base.o_s.part	2007-12-27 08:14:24.000000000 -0200
@@ -44,6 +44,7 @@
   caps:capslock		=	+capslock(capslock)
   caps:shiftlock	=	+capslock(shiftlock)
   caps:grouplock	=	+capslock(grouplock)
+  caps:swapescape	=	+capslock(swapescape)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:swapcaps		=	+ctrl(swapcaps)
   ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
diff -ruN xkeyboard-config-1.0.orig/rules/base.xml.in xkeyboard-config-1.0/rules/base.xml.in
--- xkeyboard-config-1.0.orig/rules/base.xml.in	2007-12-27 08:13:32.000000000 -0200
+++ xkeyboard-config-1.0/rules/base.xml.in	2007-12-27 08:16:36.000000000 -0200
@@ -3612,6 +3612,12 @@
       </option>
       <option>
         <configItem>
+          <name>caps:swapescape</name>
+          <_description>Swap ESC and CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>caps:shiftlock</name>
           <_description>CapsLock toggles Shift so all keys are affected.</_description>
         </configItem>
diff -ruN xkeyboard-config-1.0.orig/symbols/capslock xkeyboard-config-1.0/symbols/capslock
--- xkeyboard-config-1.0.orig/symbols/capslock	2007-12-27 08:13:32.000000000 -0200
+++ xkeyboard-config-1.0/symbols/capslock	2007-12-27 08:17:35.000000000 -0200
@@ -17,3 +17,8 @@
     key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};
 };
 
+partial hidden modifier_keys
+xkb_symbols "swapescape" {
+    key <CAPS> {        [       Escape  ]       };
+    key <ESC>  {        [     Caps_Lock    ]       };
+};