diff --git a/cloud-init-0.7.8-before-nm.patch b/cloud-init-0.7.8-before-nm.patch
new file mode 100644
index 0000000..0bf3374
--- /dev/null
+++ b/cloud-init-0.7.8-before-nm.patch
@@ -0,0 +1,12 @@
+Index: cloud-init-0.7.8/systemd/cloud-init-local.service
+===================================================================
+--- cloud-init-0.7.8.orig/systemd/cloud-init-local.service
++++ cloud-init-0.7.8/systemd/cloud-init-local.service
+@@ -5,6 +5,7 @@ Wants=local-fs.target
+ Wants=network-pre.target
+ After=local-fs.target
+ Conflicts=shutdown.target
++Before=NetworkManager.target
+ Before=network-pre.target
+ Before=shutdown.target
+ 
diff --git a/cloud-init.spec b/cloud-init.spec
index 648cfff..b004e72 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -36,6 +36,10 @@ Patch7:         cloud-init-0.7.8-dnf.patch
 # https://bugs.launchpad.net/cloud-init/+bug/1629149
 Patch8:         cloud-init-0.7.8-apt-dns-test.patch
 
+# Ensure cloud-init-local runs before NetworkManager
+# https://git.launchpad.net/cloud-init/commit/?id=1b71b47
+Patch9:         cloud-init-0.7.8-before-nm.patch
+
 BuildArch:      noarch
 
 BuildRequires:  pkgconfig
@@ -178,6 +182,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Sep 29 2016 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.8-1
 - Updated to 0.7.8
 - Dropped run-parts dependency [RH:1355917]
+- Ordered cloud-init-local before NetworkManager
 
 * Tue Aug 30 2016 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.7-1
 - Updated to 0.7.7