diff --git a/cloud-init-service.patch b/cloud-init-service.patch
index 381f84a..e650893 100644
--- a/cloud-init-service.patch
+++ b/cloud-init-service.patch
@@ -1,13 +1,27 @@
 --- systemd/cloud-init.service.orig
 +++ systemd/cloud-init.service
-@@ -1,8 +1,8 @@
+@@ -1,9 +1,20 @@
  [Unit]
  Description=Initial cloud-init job (metadata service crawler)
 -After=cloud-init-local.service networking.service
-+After=cloud-init-local.service network.service
- Before=network-online.target sshd.service sshd-keygen.service systemd-user-sessions.service
+-Before=network-online.target sshd.service sshd-keygen.service systemd-user-sessions.service
 -Requires=networking.service
+-Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service
++DefaultDependencies=no
++Wants=cloud-init-local.service
++Wants=local-fs.target
++Wants=sshd-keygen.service
++Wants=sshd.service
++After=cloud-init-local.service
++After=network.service
 +Requires=network.service
- Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service
++Before=basic.target
++Before=dbus.socket
++Before=network-online.target
++Before=sshd-keygen.service
++Before=sshd.service
++Before=systemd-user-sessions.service
++Conflicts=shutdown.target
  
  [Service]
+ Type=oneshot
diff --git a/cloud-init.changes b/cloud-init.changes
index 2eb16ef..c139ab1 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 10 20:28:47 UTC 2016 - rjschwei@suse.com
+
+- Update cloud-init-service.patch (boo#999942)
+  - Backport upstream commits 3705bb5964a and 6e45ffb21e96
+
 -------------------------------------------------------------------
 Thu Sep 15 13:01:35 UTC 2016 - rjschwei@suse.com