diff -u upstart-0.3.5/debian/changelog upstart-0.3.5/debian/changelog
--- upstart-0.3.5/debian/changelog
+++ upstart-0.3.5/debian/changelog
@@ -1,3 +1,10 @@
+upstart (0.3.5-2kyle1) feisty; urgency=low
+
+  * Check for existing event.d entries with runlevel-$N syntax
+    on upgrade and convert them.
+
+ -- Kyle McMartin <kyle@ubuntu.com>  Tue,  6 Mar 2007 17:27:56 -0500
+
 upstart (0.3.5-2) feisty; urgency=low
 
   * Changed "start script" to "pre-start script" in sulogin event, the former
diff -u upstart-0.3.5/debian/system-services.postinst upstart-0.3.5/debian/system-services.postinst
--- upstart-0.3.5/debian/system-services.postinst
+++ upstart-0.3.5/debian/system-services.postinst
@@ -24,6 +24,14 @@
     fi
 }
 
+# Older migrate-inittab.pl emitted runlevel-$N instead of runlevel $N
+convert_existing_jobs()
+{
+    event=`egrep -rl '(start|stop).*on.*runlevel-[0-9]' /etc/event.d/`;
+    for i in $event; do
+        sed -i -e 's/runlevel-//runlevel\ /' $i;
+    done;
+}
 
 case "$1" in
     configure)
@@ -31,6 +39,8 @@
 	if [ -z "$2" ]; then
 	    migrate_inittab
 	fi
+	# Check for broken /etc/event.d/ entries on all upgrades
+	convert_existing_jobs
 	;;
 
     abort-upgrade|abort-deconfigure|abort-remove)