diff --git a/ChangeLog b/ChangeLog
index dd191651f..35b1b7b38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,10 @@
      - avoid line split in SYNOPSIS
      - add args to -w
      - kill trailing whitespace
+   - jmc@cvs.openbsd.org 2005/12/08 14:59:44
+     [ssh.1 ssh_config.5]
+     make `!command' a little clearer;
+     ok reyk
 
 20051201
  - (djm) [envpass.sh] Remove regress script that was accidentally committed 
@@ -3421,4 +3425,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.4021 2005/12/13 08:30:05 djm Exp $
+$Id: ChangeLog,v 1.4022 2005/12/13 08:30:27 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 246142319..9f89b9730 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.216 2005/12/07 10:52:13 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.217 2005/12/08 14:59:44 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -304,8 +304,7 @@ options (see below).
 It also allows the cancellation of existing remote port-forwardings
 using
 .Fl KR Ar hostport .
-The
-.Ic ! Ar command
+.Ic !\& Ns Ar command
 allows the user to execute a local command if the
 .Ic PermitLocalCommand
 option is enabled in
diff --git a/ssh_config.5 b/ssh_config.5
index d1930baab..440a6d71d 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.65 2005/12/06 22:38:27 reyk Exp $
+.\" $OpenBSD: ssh_config.5,v 1.66 2005/12/08 14:59:44 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -640,7 +640,7 @@ Default is 22.
 Allow local command execution via the
 .Ic LocalCommand
 option or using the
-.Ic ! Ar command
+.Ic !\& Ns Ar command
 escape sequence in
 .Xr ssh 1 .
 The argument must be