diff --git a/Makefile.am b/Makefile.am
index dc0c99fbe90..d752ec58c24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,6 +159,13 @@ dist_systemunit_DATA += \
 	units/fedora/sysinit.service
 endif
 
+if TARGET_SUSE
+dist_systemunit_DATA += \
+	units/suse/halt.service \
+	units/suse/poweroff.service \
+	units/suse/reboot.service
+endif
+
 if TARGET_GENTOO
 dist_systemunit_DATA += \
 	units/gentoo/halt.service \
diff --git a/units/gentoo/killall.service b/units/gentoo/killall.service
index a02062f8155..626e9d1f683 100644
--- a/units/gentoo/killall.service
+++ b/units/gentoo/killall.service
@@ -8,6 +8,7 @@
 [Unit]
 Description=Kill All Processes
 After=shutdown.target
+OnlyByDependency=yes
 
 [Service]
 Type=finish
diff --git a/units/suse/halt.service b/units/suse/halt.service
new file mode 100644
index 00000000000..20a01258f89
--- /dev/null
+++ b/units/suse/halt.service
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Halt
+Requires=shutdown.target
+After=shutdown.target
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount
+
+[Service]
+Type=finish
+ValidNoProcess=yes
+Environment=INIT_HALT=HALT
+Environment=RUNLEVEL=0
+ExecStart=/etc/init.d/halt start
diff --git a/units/suse/poweroff.service b/units/suse/poweroff.service
new file mode 100644
index 00000000000..f3d15428425
--- /dev/null
+++ b/units/suse/poweroff.service
@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Power-Off
+Requires=shutdown.target
+After=shutdown.target
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount
+
+[Service]
+Type=finish
+ValidNoProcess=yes
+ExecStart=/etc/init.d/halt start
diff --git a/units/suse/reboot.service b/units/suse/reboot.service
new file mode 100644
index 00000000000..2bc452e180a
--- /dev/null
+++ b/units/suse/reboot.service
@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Reboot
+Requires=shutdown.target
+After=shutdown.target
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount
+
+[Service]
+Type=finish
+ValidNoProcess=yes
+ExecStart=/etc/init.d/reboot start