diff -u runit-2.1.1/debian/runsvdir.upstart runit-2.1.1/debian/runsvdir.upstart
--- runit-2.1.1/debian/runsvdir.upstart
+++ runit-2.1.1/debian/runsvdir.upstart
@@ -2,3 +2,5 @@
-stop on shutdown
+stop on runlevel [016]
 respawn
+kill signal HUP
 exec /usr/sbin/runsvdir-start
+
diff -u runit-2.1.1/debian/runit.postinst runit-2.1.1/debian/runit.postinst
--- runit-2.1.1/debian/runit.postinst
+++ runit-2.1.1/debian/runit.postinst
@@ -18,7 +18,7 @@
 
 if test -z "$2"; then
   # not upgrading
-  if grep '^SV:' /etc/inittab >/dev/null; then
+  if [ -f /etc/inittab ] && grep '^SV:' /etc/inittab >/dev/null; then
     if ! grep '^#-- runit begin' /etc/inittab >/dev/null; then
       cat <<\EOT >&2
 
diff -u runit-2.1.1/debian/runit.conffiles runit-2.1.1/debian/runit.conffiles
--- runit-2.1.1/debian/runit.conffiles
+++ runit-2.1.1/debian/runit.conffiles
@@ -2,0 +3 @@
+/etc/init/runsvdir.conf
diff -u runit-2.1.1/debian/rules runit-2.1.1/debian/rules
--- runit-2.1.1/debian/rules
+++ runit-2.1.1/debian/rules
@@ -110,8 +110,6 @@
 	rm -f changelog && ln -s runit/package/CHANGES changelog
 	# upstart file
 	install -D -m0644 debian/runsvdir.upstart \
-	  '$(DIR)'/etc/event.d/runsvdir || exit 1;
-	install -D -m0644 debian/runsvdir.upstart \
 	  '$(DIR)'/etc/init/runsvdir.conf || exit 1;
 
 binary-indep:
diff -u runit-2.1.1/debian/changelog runit-2.1.1/debian/changelog
--- runit-2.1.1/debian/changelog
+++ runit-2.1.1/debian/changelog
@@ -1,3 +1,16 @@
+runit (2.1.1-6.2ubuntu3) raring; urgency=low
+
+  [ Christoph Mathys ]
+  * Kill runsvdir with SIGHUP when entering runlevel [016]. Fixes LP: #245728,
+    LP: #315541 & LP: #539567.
+
+  [ Francis Russell ]
+  * Remove installation of runsvdir.conf in obsolete location /etc/event.d.
+  * Modify postinst script so that it doesn't to try to grep /etc/inittab on
+    initial package install if it doesn't exist.
+
+ -- Christoph Mathys <christoph.mathys@komaxgroup.com>  Fri, 07 Dec 2012 20:43:15 -0500
+
 runit (2.1.1-6.2ubuntu2) natty; urgency=low
 
   * Load debconf libraries and purge its old configuration files before