diff --git a/rules/base.o_k.part b/rules/base.o_k.part
deleted file mode 100644
index e69de29..0000000
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 35b6ef3..280de76 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -21,6 +21,7 @@
   grp:caps_switch       =       +capslock(groupshift)
   grp:shift_caps_toggle	=	+group(shift_caps_toggle)
   grp:shift_caps_switch	=	+group(shift_caps_switch)
+  grp:win_space_toggle	=	+group(win_space_toggle)
   grp:win_menu_switch	=	+group(win_menu_switch)
   grp:alt_caps_toggle   =       +group(alt_caps_toggle)
   grp:alt_space_toggle	=	+group(alt_space_toggle)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 874b52e..810ac4a 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -5825,6 +5825,12 @@
       </option>
       <option>
         <configItem>
+          <name>grp:win_space_toggle</name>
+          <_description>Win Key+Space</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>grp:rwin_toggle</name>
           <_description>Right Win</_description>
         </configItem>
diff --git a/symbols/group b/symbols/group
index fb2f879..e3c2b06 100644
--- a/symbols/group
+++ b/symbols/group
@@ -100,6 +100,15 @@ xkb_symbols "shift_caps_switch" {
     key <CAPS> { [ ISO_First_Group, ISO_Last_Group ] };
 };
 
+// toggle using win + space as combo
+partial modifier_keys
+xkb_symbols "win_space_toggle" {
+  key <SPCE> {
+    type[Group1]="PC_SUPER_LEVEL2",
+    symbols[Group1]= [ space, ISO_Next_Group ]
+  };
+};
+
 // using the group(win_menu_switch) map, pressing:
 // LWIN selects the first group
 // RWIN or MENU selects the last group
diff --git a/types/pc b/types/pc
index daebe74..f208d6b 100644
--- a/types/pc
+++ b/types/pc
@@ -10,6 +10,14 @@ partial default xkb_types "default" {
     virtual_modifiers RControl;
     virtual_modifiers LControl;
 
+    type "PC_SUPER_LEVEL2" {
+	modifiers = Mod4;
+	map[None] = Level1;
+	map[Mod4] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Super";
+    };
+
     type "PC_CONTROL_LEVEL2" {
 	modifiers = Control;
 	map[None] = Level1;