2 files changed, 14 insertions, 3 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index f17ccb187..58a5741b0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -203,9 +203,17 @@ authenticated and unauthenticated connections; see
 https://bugzilla.redhat.com/show_bug.cgi?id=963268 for more discussion.
 
 The provided ssh.socket unit file sets ListenStream=22.  If you need to have
-it listen on a different address or port, then you will need to do this by
-copying /lib/systemd/system/ssh.socket to /etc/systemd/system/ssh.socket and
-modifying the ListenStream option.  See systemd.socket(5) for details.
+it listen on a different address or port, then you will need to do this as
+follows (modifying ListenStream to match your requirements):
+
+  mkdir -p /etc/systemd/system/ssh.socket.d
+  cat >/etc/systemd/system/ssh.socket.d/listen.conf <<EOF
+  [Socket]
+  ListenStream=2222
+  EOF
+  systemctl daemon-reload
+
+See systemd.socket(5) for details.
 
 Terminating SSH sessions cleanly on shutdown/reboot with systemd
 ----------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 32e79e9ab..315277151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -105,6 +105,9 @@ openssh (1:7.6p1-1) UNRELEASED; urgency=medium
   * Adjust "Running sshd from inittab" instructions in README.Debian to
     recommend using service(8) rather than calling the init script directly.
   * Policy version 4.1.0.
+  * Adjust "Per-connection sshd instances with systemd" instructions in
+    README.Debian to recommend using a drop-in file rather than copying and
+    modifying the ssh.socket unit file.
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 04 Oct 2017 12:34:34 +0100