2 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 31ffeaec5..2f7b5d0b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
      Send config block back to slave for invalid users too so options
      set by a Match block (eg Banner) behave the same for non-existent
      users.  Found by and ok djm@
+   - dtucker@cvs.openbsd.org 2007/10/29 06:51:59
+     [ssh_config.5]
+     ProxyCommand and LocalCommand use the user's shell, not /bin/sh; ok djm@
 
 20071030
  - (djm) OpenBSD CVS Sync
@@ -3434,4 +3437,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4799 2007/12/02 12:02:15 dtucker Exp $
+$Id: ChangeLog,v 1.4800 2007/12/02 12:05:09 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 1a313d46a..3535d9f97 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,8 +34,8 @@
 .\" (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.103 2007/09/21 03:05:23 djm Exp $
-.Dd $Mdocdate: September 21 2007 $
+.\" $OpenBSD: ssh_config.5,v 1.104 2007/10/29 06:51:59 dtucker Exp $
+.Dd $Mdocdate: October 29 2007 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -599,7 +599,7 @@ and
 Specifies a command to execute on the local machine after successfully
 connecting to the server.
 The command string extends to the end of the line, and is executed with
-.Pa /bin/sh .
+the user's shell .
 This directive is ignored unless
 .Cm PermitLocalCommand
 has been enabled.
@@ -723,7 +723,7 @@ if version 2 is not available.
 Specifies the command to use to connect to the server.
 The command
 string extends to the end of the line, and is executed with
-.Pa /bin/sh .
+the user's shell .
 In the command string,
 .Ql %h
 will be substituted by the host name to