diff -Nru openssh-5.5p1/debian/changelog openssh-5.5p1/debian/changelog
--- openssh-5.5p1/debian/changelog	2010-09-14 20:50:58.000000000 +0300
+++ openssh-5.5p1/debian/changelog	2010-12-28 21:15:50.000000000 +0200
@@ -1,3 +1,10 @@
+openssh (1:5.5p1-4ubuntu5) maverick; urgency=low
+
+  *  debian/openssh-server.ssh.upstart: drop 'expect fork' and run sshd
+     with -D to avoid losing track on reload (LP: #687535)
+
+ -- Imre Gergely <gimre@narancs.net>  Tue, 28 Dec 2010 21:15:24 +0200
+
 openssh (1:5.5p1-4ubuntu4) maverick; urgency=low
 
   * Fix stray hyphen in the title of ssh-import-id(1).
diff -Nru openssh-5.5p1/debian/openssh-server.ssh.upstart openssh-5.5p1/debian/openssh-server.ssh.upstart
--- openssh-5.5p1/debian/openssh-server.ssh.upstart	2010-07-09 14:18:24.000000000 +0300
+++ openssh-5.5p1/debian/openssh-server.ssh.upstart	2010-12-28 21:16:14.000000000 +0200
@@ -7,7 +7,6 @@
 start on filesystem
 stop on runlevel [!2345]
 
-expect fork
 respawn
 respawn limit 10 5
 umask 022
@@ -22,4 +21,4 @@
 
 # if you used to set SSHD_OPTS in /etc/default/ssh, you can change the
 # 'exec' line here instead
-exec /usr/sbin/sshd
+exec /usr/sbin/sshd -D