diff --git a/1017-skip-native-unit-handling-if-sysv-already-handled.patch b/1017-skip-native-unit-handling-if-sysv-already-handled.patch
new file mode 100644
index 00000000..e21e14eb
--- /dev/null
+++ b/1017-skip-native-unit-handling-if-sysv-already-handled.patch
@@ -0,0 +1,20 @@
+For bnc#818044
+Based on http://cgit.freedesktop.org/systemd/systemd/patch/?id=67d6621059085963a2a908a3ea99ced3b0ca789e
+---
+ systemctl.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- systemd-208/src/systemctl/systemctl.c
++++ systemd-208/src/systemctl/systemctl.c	2014-01-21 13:00:52.910736187 +0000
+@@ -4453,6 +4453,11 @@ static int enable_unit(DBusConnection *b
+         if (r < 0)
+                 return r;
+ 
++        /* If the operation was fully executed by the SysV compat,
++         * let's finish early */
++        if (strv_isempty(names))
++                return 0;
++
+         if (!bus || avoid_bus()) {
+                 if (streq(verb, "enable")) {
+                         r = unit_file_enable(arg_scope, arg_runtime, arg_root, mangled_names, arg_force, &changes, &n_changes);
diff --git a/systemd.changes b/systemd.changes
index b1df88a4..920ab0fb 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 21 13:05:59 UTC 2014 - werner@suse.de
+
+- Add patch 1017-skip-native-unit-handling-if-sysv-already-handled.patch
+  to avoid that enabled boot scripts will be handled as unit files
+  by systemctl status command (bnc#818044)
+
 -------------------------------------------------------------------
 Tue Jan 21 12:51:20 UTC 2014 - werner@suse.de
 
diff --git a/systemd.spec b/systemd.spec
index a27e22c8..625998a5 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -284,6 +284,8 @@ Patch1014:      1014-journald-with-journaling-FS.patch
 Patch1015:      build-sys-make-multi-seat-x-optional.patch
 # PATCH-FIX-SUSE 1016-support-powerfail-with-powerstatus.patch
 Patch1016:      1016-support-powerfail-with-powerstatus.patch
+# PATCH-FIX-UPSTREAM 1017-skip-native-unit-handling-if-sysv-already-handled.patch
+Patch1017:      1017-skip-native-unit-handling-if-sysv-already-handled.patch
 # PATCH-FIX-SUSE 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
 Patch1018:      1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
 # PATCH-FIX-SUSE 1019-make-completion-smart-to-be-able-to-redirect.patch
@@ -572,6 +574,7 @@ cp %{SOURCE7} m4/
 %patch1014 -p1
 %patch1015 -p1
 %patch1016 -p1
+%patch1017 -p1
 %patch1018 -p1
 %patch1019 -p1