diff --git a/99-wakeup-from-idle.rules b/99-wakeup-from-idle.rules
new file mode 100644
index 00000000..b463ee78
--- /dev/null
+++ b/99-wakeup-from-idle.rules
@@ -0,0 +1,3 @@
+# enable usb and standard AT Keyboards as wakeup sources for suspend-to-idle (S2I) fate#323814
+ACTION=="add", ATTR{power/wakeup}=="disabled", SUBSYSTEM=="serio", ATTR{description}=="i8042 KBD port", ATTR{power/wakeup}="enabled"
+ACTION=="add", ATTR{power/wakeup}=="disabled", SUBSYSTEM=="hid", ATTRS{bInterfaceProtocol}=="01", ATTR{power/wakeup}="enabled"
diff --git a/systemd-mini.changes b/systemd-mini.changes
index 0ee0ba37..a560fd1e 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -15,6 +15,15 @@ Thu Mar  1 10:13:02 UTC 2018 - fbui@suse.com
   level. Those rules have been rejected by upstream and are defining
   some defaults which should maintain by the kernel folks.
 
+-------------------------------------------------------------------
+Wed Feb 28 06:53:02 UTC 2018 - Thomas.Blume@suse.com
+
+- add basic user space support for suspend to idle (fate#323814)
+    add 99-wakeup-from-idle.rules
+    Currently this only covers the power button and usb/AT keyboards
+    as wakeup devices. It is planned to make that configurable in
+    the future.
+
 -------------------------------------------------------------------
 Tue Feb 27 09:04:32 UTC 2018 - fbui@suse.com
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 1ab9c036..ec34fbfb 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -153,7 +153,8 @@ Source200:      scripts-udev-convert-lib-udev-path.sh
 
 Source1000:     60-ssd-scheduler.rules
 Source1001:     80-hotplug-cpu-mem.rules
-Source1002:     udev-remount-tmpfs
+Source1002:     99-wakeup-from-idle.rules
+Source1003:     udev-remount-tmpfs
 
 # Patches listed in here are put in quarantine. Normally all
 # changes must go to upstream first and then are cherry-picked in the
@@ -497,7 +498,8 @@ install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-insta
 # The rules that we shouldn't maintain
 install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-ssd-scheduler.rules
 install -m0644 -D %{S:1001} %{buildroot}%{_udevrulesdir}/80-hotplug-cpu-mem.rules
-install -m0755 -D %{S:1002} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs
+install -m0644 -D %{S:1002} %{buildroot}%{_udevrulesdir}/99-wakeup-from-idle.rules
+install -m0755 -D %{S:1003} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs
 
 # Package the scripts used to fix all packaging issues. Also drop the
 # "scripts-{systemd/udev}" prefix which is used because osc doesn't
diff --git a/systemd.changes b/systemd.changes
index 0ee0ba37..a560fd1e 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -15,6 +15,15 @@ Thu Mar  1 10:13:02 UTC 2018 - fbui@suse.com
   level. Those rules have been rejected by upstream and are defining
   some defaults which should maintain by the kernel folks.
 
+-------------------------------------------------------------------
+Wed Feb 28 06:53:02 UTC 2018 - Thomas.Blume@suse.com
+
+- add basic user space support for suspend to idle (fate#323814)
+    add 99-wakeup-from-idle.rules
+    Currently this only covers the power button and usb/AT keyboards
+    as wakeup devices. It is planned to make that configurable in
+    the future.
+
 -------------------------------------------------------------------
 Tue Feb 27 09:04:32 UTC 2018 - fbui@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index d8cebceb..a68f2b08 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -151,7 +151,8 @@ Source200:      scripts-udev-convert-lib-udev-path.sh
 
 Source1000:     60-ssd-scheduler.rules
 Source1001:     80-hotplug-cpu-mem.rules
-Source1002:     udev-remount-tmpfs
+Source1002:     99-wakeup-from-idle.rules
+Source1003:     udev-remount-tmpfs
 
 # Patches listed in here are put in quarantine. Normally all
 # changes must go to upstream first and then are cherry-picked in the
@@ -495,7 +496,8 @@ install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-insta
 # The rules that we shouldn't maintain
 install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-ssd-scheduler.rules
 install -m0644 -D %{S:1001} %{buildroot}%{_udevrulesdir}/80-hotplug-cpu-mem.rules
-install -m0755 -D %{S:1002} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs
+install -m0644 -D %{S:1002} %{buildroot}%{_udevrulesdir}/99-wakeup-from-idle.rules
+install -m0755 -D %{S:1003} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs
 
 # Package the scripts used to fix all packaging issues. Also drop the
 # "scripts-{systemd/udev}" prefix which is used because osc doesn't