diff --git a/ssh.1 b/ssh.1
index 8a55c2f..2461423 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 @@
 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 @@
 .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