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	2011-05-26 22:18:19.000000000 +0000
+++ autofs5-5.0.6/debian/autofs5.autofs.upstart	2012-03-10 00:35:19.000000000 +0000
@@ -1,13 +1,17 @@
 description	"Automounter"
 author		"Chuck Short <zulcss@ubuntu.com>"
 
-start on filesystem and started networking
+start on runlevel [2345]
 stop on runlevel [!2345]
 
 expect fork
 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
 end script
 
diff -Nru autofs5-5.0.6/debian/changelog autofs5-5.0.6/debian/changelog
--- autofs5-5.0.6/debian/changelog	2012-02-17 01:10:37.000000000 +0000
+++ autofs5-5.0.6/debian/changelog	2012-03-10 00:48:09.000000000 +0000
@@ -1,3 +1,11 @@
+autofs5 (5.0.6-0ubuntu4) precise; urgency=low
+
+  * d/autofs5.autofs.upstart: Wait for NIS if it is installed. Also
+    use the more generic runlevel event to start (LP: #573919)
+  * d/control: Depend on upstart >= 0.9.7-2 since we rely on wait-for-state.
+
+ -- Clint Byrum <clint@ubuntu.com>  Fri, 09 Mar 2012 16:47:40 -0800
+
 autofs5 (5.0.6-0ubuntu3) precise; urgency=low
 
   * debian/rules:
diff -Nru autofs5-5.0.6/debian/control autofs5-5.0.6/debian/control
--- autofs5-5.0.6/debian/control	2011-07-14 11:54:21.000000000 +0000
+++ autofs5-5.0.6/debian/control	2012-03-10 00:47:39.000000000 +0000
@@ -9,7 +9,7 @@
 
 Package: autofs5
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, ucf, upstart (>= 0.9.7-2)
 Recommends: nfs-common, module-init-tools
 Suggests: smbfs
 Description: kernel-based automounter for Linux, version 5