diff --git a/cloud-init-0.7.6-user-session.patch b/cloud-init-0.7.6-user-session.patch
new file mode 100644
index 0000000..df36ee9
--- /dev/null
+++ b/cloud-init-0.7.6-user-session.patch
@@ -0,0 +1,13 @@
+Index: cloud-init-0.7.6/systemd/cloud-init.service
+===================================================================
+--- cloud-init-0.7.6.orig/systemd/cloud-init.service
++++ cloud-init-0.7.6/systemd/cloud-init.service
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Initial cloud-init job (metadata service crawler)
+ After=local-fs.target network-online.target cloud-init-local.service
+-Before=sshd.service sshd-keygen.service
++Before=sshd.service sshd-keygen.service systemd-user-sessions.service
+ Requires=network-online.target
+ Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service
+ 
diff --git a/cloud-init.spec b/cloud-init.spec
index 803ae50..5761217 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -43,6 +43,10 @@ Patch4:         cloud-init-0.7.6-groupadd-list.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1147613
 Patch5:         cloud-init-0.7.6-network-online.patch
 
+# Ensure cloud-init.service doesn't write all over the login prompt
+# http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/revision/1050
+Patch6:         cloud-init-0.7.6-user-session.patch
+
 # Deal with noarch -> arch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1067089
 Obsoletes:      cloud-init < 0.7.5-3
@@ -175,6 +179,7 @@ fi
 - Added recognition of 3 ecdsa-sha2-nistp* ssh key types [RH:1151824]
 - Fixed handling of user group lists that contain spaces [RH:1126365 LP:1354694]
 - Changed network.target systemd deps to network-online.target [RH:1110731 RH:1112817 RH:1147613]
+- Fixed race condition between cloud-init.service and the login prompt
 
 * Fri Nov 14 2014 Colin Walters <walters@redhat.com> - 0.7.6-2
 - New upstream version [RH:974327]