Index: symbols/altwin
===================================================================
RCS file: /cvs/xlibs/xkbdesc/symbols/altwin,v
retrieving revision 1.4
diff -u -r1.4 altwin
--- symbols/altwin	1 Oct 2005 12:20:31 -0000	1.4
+++ symbols/altwin	31 Aug 2006 22:49:23 -0000
@@ -58,3 +58,9 @@
     modifier_map Mod1   { Alt_L, Alt_R, Meta_L, Meta_R };
     modifier_map Mod4   { Super_L, Super_R };
 };
+
+partial modifier_keys 
+xkb_symbols "swap_ralt_rwin" {
+    key <RALT> {	[ 	Super_R			]	};
+    key <RWIN> {	[	Alt_R,	Meta_R		]	};
+};
Index: rules/base.o_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.o_s.part,v
retrieving revision 1.11
diff -u -r1.11 base.o_s.part
--- rules/base.o_s.part	30 Aug 2006 23:47:26 -0000	1.11
+++ rules/base.o_s.part	31 Aug 2006 22:49:23 -0000
@@ -44,6 +44,7 @@
   altwin:super_win	=	+altwin(super_win)
   altwin:hyper_win	=	+altwin(hyper_win)
   altwin:alt_super_win	=	+altwin(alt_super_win)
+  altwin:swap_ralt_rwin	=	+altwin(swap_ralt_rwin)
   compose:ralt		=	+compose(ralt)
   compose:lwin		=	+compose(lwin)
   compose:rwin		=	+compose(rwin)
Index: rules/base.xml.in
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.xml.in,v
retrieving revision 1.140
diff -u -r1.140 base.xml.in
--- rules/base.xml.in	31 Aug 2006 21:44:13 -0000	1.140
+++ rules/base.xml.in	31 Aug 2006 22:49:25 -0000
@@ -3045,6 +3045,12 @@
           <_description>Alt is mapped to the right Win-key and Super to Menu.</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>altwin:swap_ralt_rwin</name>
+          <_description>Right Alt is swapped with right Win-key.</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->