diff --git a/ChangeLog b/ChangeLog
index 5c45998c8..f6d4c4447 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20010409
+ - OpenBSD CVS Sync
+   - stevesk@cvs.openbsd.org 2001/04/08 16:01:36
+     [sshd.8]
+     document ListenAddress addr:port
+
 20010408
  - OpenBSD CVS Sync
    - stevesk@cvs.openbsd.org 2001/04/06 22:12:47
@@ -4937,4 +4943,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1079 2001/04/07 17:25:48 mouring Exp $
+$Id: ChangeLog,v 1.1080 2001/04/08 18:02:43 mouring Exp $
diff --git a/sshd.8 b/sshd.8
index 65d3ca751..b4e2af155 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.109 2001/04/02 14:15:31 stevesk Exp $
+.\" $OpenBSD: sshd.8,v 1.110 2001/04/08 16:01:36 stevesk Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -485,14 +485,35 @@ The key is never stored anywhere.
 If the value is 0, the key is never regenerated.
 The default is 3600 (seconds).
 .It Cm ListenAddress
-Specifies what local address
+Specifies the local addresses
 .Nm
 should listen on.
-The default is to listen to all local addresses.
-Multiple options of this type are permitted.
-Additionally, the
-.Cm Ports
-options must precede this option.
+The following forms may be used:
+.Pp
+.Bl -item -offset indent -compact
+.It
+.Cm ListenAddress
+host|IPv4_addr|IPv6_addr
+.It
+.Cm ListenAddress
+host|IPv4_addr:port
+.It
+.Cm ListenAddress
+[host|IPv6_addr]:port
+.El
+.Pp
+If
+.Dq :port
+is not specified,
+.Nm
+will listen on the address and all prior
+.Cm Port
+options specified. The default is to listen on all local
+addresses.  Multiple
+.Cm ListenAddress
+options are permitted. Additionally, any
+.Cm Port
+options must precede this option for non port qualified addresses.
 .It Cm LoginGraceTime
 The server disconnects after this time if the user has not
 successfully logged in.