2 files changed, 7 insertions, 0 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 4d16eb4d8..dee9ddb21 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -224,6 +224,11 @@ MaxConnections cannot quite replace this as it cannot distinguish between
 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.
+
 -- 
 Matthew Vernon <matthew@debian.org>
 Colin Watson <cjwatson@debian.org>
diff --git a/debian/changelog b/debian/changelog
index 18b08f984..5fdc964d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:6.7p1-4) UNRELEASED; urgency=medium
 
   * Send/accept only specific known LC_* variables, rather than using a
     wildcard (closes: #765633).
+  * Document interactions between ListenAddress/Port and ssh.socket in
+    README.Debian (closes: #764842).
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 06 Nov 2014 10:39:11 +0000