diff -u autofs5-5.0.4/debian/rules autofs5-5.0.4/debian/rules
--- autofs5-5.0.4/debian/rules
+++ autofs5-5.0.4/debian/rules
@@ -47,7 +47,7 @@
 	dh_install
 	dh_installchangelogs CHANGELOG
 	dh_installdocs
-	dh_installinit -pautofs5 -o --name=autofs -- start 19 2 3 4 5 . stop 81 0 1 6 .
+	dh_installinit -pautofs5 --name=autofs -- start 19 2 3 4 5 . stop 81 0 1 6 .
 	dh_strip
 	dh_compress
 	dh_fixperms -Xdebian/autofs5-ldap/etc/autofs_ldap_auth.conf
diff -u autofs5-5.0.4/debian/changelog autofs5-5.0.4/debian/changelog
--- autofs5-5.0.4/debian/changelog
+++ autofs5-5.0.4/debian/changelog
@@ -1,3 +1,12 @@
+autofs5 (5.0.4-3.1ubuntu5) lucid; urgency=low
+
+  FFE LP: #
+
+  * Replace init script with Upstart job:
+    - debian/rules, debian/autofs5.autofs.upstart: Add upstart job.  
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 12 Apr 2010 08:56:32 -0400
+
 autofs5 (5.0.4-3.1ubuntu4) lucid; urgency=low
 
   * debian/control: Update maintainer. 
only in patch2:
unchanged:
--- autofs5-5.0.4.orig/debian/autofs5.autofs.upstart
+++ autofs5-5.0.4/debian/autofs5.autofs.upstart
@@ -0,0 +1,53 @@
+description	"Automounter"
+author		"Chuck Short <zulcss@ubuntu.com>"
+
+start on (filesystem
+	and net-device-up IFACE!=lo)
+stop on runlevel[!2345]
+
+console output
+expect fork
+respawn
+
+script
+	if [ -f /etc/default/autofs ]; then
+		. /etc/default/autofs
+	fi
+
+	if ! grep -q autofs /proc/filesystems
+        then
+                # Try load the autofs4 module fail if we can't
+                modprobe autofs4 >/dev/null 2>&1
+                if [ $? -eq 1 ]
+                then
+                        echo "Error: failed to load autofs4 module."
+                        return 1
+                fi
+        elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4]
+        then
+                # wrong autofs filesystem module loaded
+                echo
+                echo "Error: autofs kernel module is loaded, autofs4 required"
+                return 1
+        fi
+
+	if [ -n "$USE_MISC_DEVICE" -a "x$USE_MISC_DEVICE" = "xyes" ]; then
+                sleep 1
+                if [ -e "/proc/misc" ]; then
+                        MINOR=`awk "/autofs/ {print \\$1}" /proc/misc`
+                        if [ -n "$MINOR" -a ! -c "/dev/autofs" ]; then
+                                mknod -m 0600 /dev/autofs c 10 $MINOR
+                        fi
+                fi
+                if [ -x /sbin/restorecon -a -c /dev/autofs ]; then
+                        /sbin/restorecon /dev/autofs
+                fi
+        else
+                if [ -c /dev/autofs ]; then
+                        rm /dev/autofs
+                fi
+        fi
+
+
+	exec /usr/sbin/automount $OPTIONS
+end script