diff -Nru autofs5-5.0.6/debian/autofs5.autofs.upstart autofs5-5.0.6/debian/autofs5.autofs.upstart
--- autofs5-5.0.6/debian/autofs5.autofs.upstart	2012-03-10 00:35:19.000000000 +0000
+++ autofs5-5.0.6/debian/autofs5.autofs.upstart	2012-03-22 11:01:50.000000000 +0000
@@ -1,5 +1,5 @@
-description	"Automounter"
-author		"Chuck Short <zulcss@ubuntu.com>"
+description "Automounter"
+author      "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]
 stop on runlevel [!2345]
@@ -8,16 +8,12 @@
 respawn
 
 pre-start script
-    # If there is a ypbind upstart job, wait for ypbind
-    if status ypbind >/dev/null ; then
-        start wait-for-state WAITER=autofs5 WAIT_FOR=ypbind
-    fi
-	modprobe -q autofs4 || true
+    modprobe -q autofs4 || true
 end script
 
 script
-	if [ -f /etc/default/autofs ] ; then
-		. /etc/default/autofs
-	fi
-	exec /usr/sbin/automount $OPTIONS
+    if [ -f /etc/default/autofs ] ; then
+        . /etc/default/autofs
+    fi
+    exec /usr/sbin/automount $OPTIONS
 end script
diff -Nru autofs5-5.0.6/debian/changelog autofs5-5.0.6/debian/changelog
--- autofs5-5.0.6/debian/changelog	2012-03-10 00:48:09.000000000 +0000
+++ autofs5-5.0.6/debian/changelog	2012-03-22 11:02:30.000000000 +0000
@@ -1,3 +1,12 @@
+autofs5 (5.0.6-0ubuntu5) precise; urgency=low
+
+  * d/autofs5.autofs.upstart: Drop wait-for-state from configuration as 
+    waiting for NIS to start is already handled in the NIS package by 
+    the start-ypbind upstart configuration which supports autofs 
+    (LP: #958704). 
+
+ -- James Page <james.page@ubuntu.com>  Thu, 22 Mar 2012 11:02:03 +0000
+
 autofs5 (5.0.6-0ubuntu4) precise; urgency=low
 
   * d/autofs5.autofs.upstart: Wait for NIS if it is installed. Also