diff --git a/ChangeLog b/ChangeLog
index 337f70086..dd191651f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,11 +20,15 @@
      except that it depends on the tun(4) network interface on both ends of
      the connection for layer 2 or layer 3 tunneling. This diff also adds
      support for LocalCommand in the ssh(1) client.
-
      ok djm@, markus@, jmc@ (manpages), tested and discussed with others
    - djm@cvs.openbsd.org 2005/12/07 03:52:22
      [clientloop.c]
      reyk forgot to compile with -Werror (missing header)
+   - jmc@cvs.openbsd.org 2005/12/07 10:52:13
+     [ssh.1]
+     - avoid line split in SYNOPSIS
+     - add args to -w
+     - kill trailing whitespace
 
 20051201
  - (djm) [envpass.sh] Remove regress script that was accidentally committed 
@@ -3417,4 +3421,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4020 2005/12/13 08:29:36 djm Exp $
+$Id: ChangeLog,v 1.4021 2005/12/13 08:30:05 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 8a55c2f64..246142319 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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: ssh.1,v 1.215 2005/12/06 22:38:27 reyk Exp $
+.\" $OpenBSD: ssh.1,v 1.216 2005/12/07 10:52:13 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -77,9 +77,11 @@
 .Sm on
 .Oc
 .Op Fl S Ar ctl_path
-.Op Fl w Ar tunnel : tunnel
+.Bk -words
+.Op Fl w Ar tunnel : Ns Ar tunnel
 .Oo Ar user Ns @ Oc Ns Ar hostname
 .Op Ar command
+.Ek
 .Sh DESCRIPTION
 .Nm
 (SSH client) is a program for logging into a remote machine and for
@@ -302,7 +304,7 @@ options (see below).
 It also allows the cancellation of existing remote port-forwardings
 using
 .Fl KR Ar hostport .
-The 
+The
 .Ic ! Ar command
 allows the user to execute a local command if the
 .Ic PermitLocalCommand
@@ -877,7 +879,7 @@ Multiple
 .Fl v
 options increase the verbosity.
 The maximum is 3.
-.It Fl w
+.It Fl w Ar tunnel : Ns Ar tunnel
 Requests a
 .Xr tun 4
 device on the client and server like the