--- xkeyboard-config-2.12.orig/rules/base.o_s.part
+++ xkeyboard-config-2.12/rules/base.o_s.part
@@ -79,6 +79,10 @@
   ctrl:rctrl_ralt	=	+ctrl(rctrl_ralt)
   ctrl:menu_rctrl	=	+ctrl(menu_rctrl)
   ctrl:ralt_rctrl	=	+ctrl(ralt_rctrl)
+  ctrl:swap_lalt_lctl	=	+ctrl(swap_lalt_lctl)
+  ctrl:swap_lwin_lctl	=	+ctrl(swap_lwin_lctl)
+  ctrl:swap_rwin_rctl	=	+ctrl(swap_rwin_rctl)
+  ctrl:swap_lalt_lctl_lwin  =	+ctrl(swap_lalt_lctl_lwin)
   compose:ralt		=	+compose(ralt)
   compose:lwin		=	+compose(lwin)
   compose:lwin-altgr	=	+compose(lwin-altgr)
--- xkeyboard-config-2.12.orig/rules/base.xml.in
+++ xkeyboard-config-2.12/rules/base.xml.in
@@ -6103,6 +6103,11 @@
           <name>ctrl:swap_lwin_lctl</name>
           <_description>Swap Left Win key with Left Ctrl key</_description>
         </configItem>
+      </option><option>
+        <configItem>
+          <name>ctrl:swap_rwin_rctl</name>
+          <_description>Swap Right Win key with Right Ctrl key</_description>
+        </configItem>
       </option>
       <option>
         <configItem>
--- xkeyboard-config-2.12.orig/rules/evdev.xml.in
+++ xkeyboard-config-2.12/rules/evdev.xml.in
@@ -6103,6 +6103,11 @@
           <name>ctrl:swap_lwin_lctl</name>
           <_description>Swap Left Win key with Left Ctrl key</_description>
         </configItem>
+      </option><option>
+        <configItem>
+          <name>ctrl:swap_rwin_rctl</name>
+          <_description>Swap Right Win key with Right Ctrl key</_description>
+        </configItem>
       </option>
       <option>
         <configItem>
--- xkeyboard-config-2.12.orig/symbols/ctrl
+++ xkeyboard-config-2.12/symbols/ctrl
@@ -70,6 +70,13 @@
     replace key <LCTL> { [ Super_L ] };
 };
 
+// Swap the functions of the right Win key and the right Ctrl key.
+partial modifier_keys
+xkb_symbols "swap_rwin_rctl" {
+    replace key <RWIN> { [ Control_R ] };
+    replace key <RCTL> { [ Super_R ] };
+};
+
 // Map Ctrl to the left Alt key, Alt to the left Win key,
 // and Super to the left Ctrl key.
 partial modifier_keys