diff -r -u3 xkbcomp.orig/rules/xfree86 xkbcomp/rules/xfree86
--- xkbcomp.orig/rules/xfree86	2004-05-23 08:28:46.000000000 +0200
+++ xkbcomp/rules/xfree86	2004-05-23 08:48:45.000000000 +0200
@@ -180,6 +180,7 @@
   altwin:left_meta_win	=	+altwin(left_meta_win)
   altwin:super_win	=	+altwin(super_win)
   altwin:hyper_win	=	+altwin(hyper_win)
+  altwin:alt_super_win	=	+altwin(alt_super_win)
   compose:ralt		=	+compose(ralt)
   compose:rwin		=	+compose(rwin)
   compose:menu		=	+compose(menu)
diff -r -u3 xkbcomp.orig/rules/xfree86.xml xkbcomp/rules/xfree86.xml
--- xkbcomp.orig/rules/xfree86.xml	2004-05-23 08:27:12.000000000 +0200
+++ xkbcomp/rules/xfree86.xml	2004-05-23 08:58:57.000000000 +0200
@@ -5704,7 +5704,7 @@
       </option>
       <option>
         <configItem>
-          <name>altwin:meta_super</name>
+          <name>altwin:super_win</name>
           <description>Super is mapped to the Win-keys (default).</description>
           <description xml:lang="bg">Win клавишите функционират като Super</description>
           <description xml:lang="cs">Super je mapováno na klávesy Win (výchozí).</description>
@@ -5722,7 +5722,7 @@
       </option>
       <option>
         <configItem>
-          <name>altwin:meta_hyper</name>
+          <name>altwin:hyper_win</name>
           <description>Hyper is mapped to the Win-keys.</description>
           <description xml:lang="bg">Hyper съответства на клавишите Win</description>
           <description xml:lang="cs">Hyper je mapována na klávesy Win.</description>
@@ -5738,6 +5738,12 @@
           <description xml:lang="zh_CN">Hyper 被映射到 Windows 键。</description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>altwin:alt_super_win</name>
+          <description>Alt is mapped to the right Win-key and Super to Menu.</description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <configItem>
diff -r -u3 xkbcomp.orig/symbols/altwin xkbcomp/symbols/altwin
--- xkbcomp.orig/symbols/altwin	2004-05-23 08:37:49.000000000 +0200
+++ xkbcomp/symbols/altwin	2004-05-23 08:49:13.000000000 +0200
@@ -41,3 +41,14 @@
     key <MENU> {	[ 	Menu		]	};
 };
 
+// Layout for Tux key caps with additional right Alt key
+partial modifier_keys 
+xkb_symbols "alt_super_win" {
+    key <LALT> {	[ 	Alt_L,	Meta_L		]	};
+    key <RWIN> {	[ 	Alt_R,	Meta_R		]	};
+    key <LWIN> {	[ 	Super_L			]	};
+    key <MENU> {	[ 	Super_R			]	};
+    modifier_map Mod1	{ Alt_L, Alt_R, Meta_L, Meta_R };
+    modifier_map Mod4	{ Super_L, Super_R };
+};
+