2 files changed, 5 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index e0f35ef1c..246619557 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,8 +58,9 @@ openssh (1:4.6p1-1) UNRELEASED; urgency=low
   * Build the .deb --with-ssl-engine (closes: #408027, LP: #119295).
   * Use LSB functions in init scripts, and add an LSB-style header (partly
     from Ubuntu and partly thanks to Christian Perrier; closes: #389038).
-  * Move init script start links to S16, and remove stop links altogether
-    (the latter from Ubuntu; closes: #122188).
+  * Move init script start links to S16, move rc1 stop link to K84, and
+    remove rc0 and rc6 stop links altogether (the last part from Ubuntu;
+    closes: #122188).
   * Emit a slightly more informative message from the init script if
     /dev/null has somehow become not a character device (closes: #369964).
   * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447).
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index 32d0e46ff..e73d3957c 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -356,7 +356,7 @@ remove_old_init_links() {
 
 setup_init() {
         if [ -x /etc/init.d/ssh ]; then
-                update-rc.d ssh start 16 2 3 4 5 . >/dev/null
+                update-rc.d ssh start 16 2 3 4 5 . stop 84 1 . >/dev/null
                 if [ -x /usr/sbin/invoke-rc.d ]; then
                         invoke-rc.d ssh restart
                 else
@@ -386,7 +386,7 @@ if dpkg --compare-versions "$2" lt 1:3.6.1p2-2; then
     fix_conffile_permissions
 fi
 if dpkg --compare-versions "$2" lt 1:4.6p1-1; then
-    remove_old_init_link
+    remove_old_init_links
 fi
 setup_init
 commit_transfer_conffile /etc/default/ssh