diff -u tftp-hpa-5.0/debian/changelog tftp-hpa-5.0/debian/changelog
--- tftp-hpa-5.0/debian/changelog
+++ tftp-hpa-5.0/debian/changelog
@@ -1,3 +1,10 @@
+tftp-hpa (5.0-11ubuntu2) lucid; urgency=low
+
+  * debian/rules, debian/tftpd-hpa.upstart: Convert to upstart.
+    (LP: #522509) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Thu, 11 Mar 2010 12:40:07 -0500
+
 tftp-hpa (5.0-11ubuntu1) lucid; urgency=low
 
   * Revert to pre-Lucid behavior (LP: #518815):
diff -u tftp-hpa-5.0/debian/rules tftp-hpa-5.0/debian/rules
--- tftp-hpa-5.0/debian/rules
+++ tftp-hpa-5.0/debian/rules
@@ -24 +24 @@
-	dh_installinit -a -- start 20 2 3 4 5 . stop 20 1 .
+	dh_installinit -a --upstart-only -- start 20 2 3 4 5 . stop 20 1 .
only in patch2:
unchanged:
--- tftp-hpa-5.0.orig/debian/tftpd-hpa.upstart
+++ tftp-hpa-5.0/debian/tftpd-hpa.upstart
@@ -0,0 +1,29 @@
+# tftp-hpa - trivial ftp server
+
+description	"tftp-hpa server"
+author		"Chuck Short <zulcss@ubuntu.com>"
+
+start on (local-filesystem
+	and net-device-up IFACE=eth0)
+stop on runlevel [!2345]
+
+console output
+expect fork
+respawn
+
+env PIDFILE="/var/run/tftpd-hpa.pid"
+env DEFAULTS="/etc/default/tftpd-hpa"
+
+script
+
+	if [ -f ${DEFAULTS} ]; then
+		. ${DEFAULTS}
+	fi
+
+	if [ ! -d "${TFTP_DIRECTORY}" ]; then
+		echo "${TFTP_DIRECTORY} missing, aborting."
+		exit 1
+	fi
+
+	exec /usr/sbin/in.tftpd --listen  --user ${TFTP_USERNAME} --address ${TFTP_ADDRESS} ${TFTP_OPTIONS} ${TFTP_DIRECTORY}
+end script