diff --git a/ChangeLog b/ChangeLog
index bdc7acca3..bf62b4131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20140709
+ - OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2014/07/07 08:19:12
+     [ssh_config.5]
+     mention that ProxyCommand is executed using shell "exec" to avoid
+     a lingering process; bz#1977
+
 20140706
  - OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2014/07/03 23:18:35
diff --git a/ssh_config.5 b/ssh_config.5
index 81b20aa09..71b9bdcc5 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,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.189 2014/07/03 07:45:27 jmc Exp $
-.Dd $Mdocdate: July 3 2014 $
+.\" $OpenBSD: ssh_config.5,v 1.190 2014/07/07 08:19:12 djm Exp $
+.Dd $Mdocdate: July 7 2014 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1086,8 +1086,11 @@ The default is
 .It Cm ProxyCommand
 Specifies the command to use to connect to the server.
 The command
-string extends to the end of the line, and is executed with
-the user's shell.
+string extends to the end of the line, and is executed
+using the user's shell
+.Ql exec
+directive to avoid a lingering shell process.
+.Pp
 In the command string, any occurrence of
 .Ql %h
 will be substituted by the host name to