2 files changed, 4 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 3d983a9df..873e437d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ openssh (1:6.5p1-5) UNRELEASED; urgency=medium
   [ Colin Watson ]
   * Add Alias=sshd.service to systemd ssh.service file, to match "Provides:
     sshd" in the sysvinit script (thanks, Michael Biebl).
+  * Add Before=ssh.service to systemd ssh.socket file, since otherwise
+    nothing guarantees that ssh.service has stopped before ssh.socket starts
+    (thanks, Uoti Urpala).
 
   [ Axel Beckert ]
   * Split sftp-server into its own package to allow it to also be used by
diff --git a/debian/systemd/ssh.socket b/debian/systemd/ssh.socket
index fa1f615e4..5a766dcab 100644
--- a/debian/systemd/ssh.socket
+++ b/debian/systemd/ssh.socket
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenBSD Secure Shell server socket
+Before=ssh.service
 Conflicts=ssh.service
 ConditionPathExists=!/etc/ssh/sshd_not_to_be_run