diff --git a/ChangeLog b/ChangeLog
index 1064c87fc..6679cb961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@
      [ssh-keyscan.c]
      fix memory fault if non-existent filename is given to the -f option
      ok markus@
+   - markus@cvs.openbsd.org 2001/08/28 09:51:26
+     [readconf.c]
+     don't set DynamicForward unless Host matches
 
 20010815
  - (bal) Fixed stray code in readconf.c that went in by mistake.
@@ -6359,4 +6362,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1495 2001/09/12 17:10:40 mouring Exp $
+$Id: ChangeLog,v 1.1496 2001/09/12 17:35:27 mouring Exp $
diff --git a/readconf.c b/readconf.c
index 16a14df51..d334ed437 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.86 2001/08/01 22:03:33 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.87 2001/08/28 09:51:26 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -624,7 +624,8 @@ parse_int:
 		if (fwd_port == 0)
 			fatal("%.200s line %d: Badly formatted port number.",
 			    filename, linenum);
-		add_local_forward(options, fwd_port, "socks4", 0);
+		if (*activep)
+			add_local_forward(options, fwd_port, "socks4", 0);
 		break;
 
 	case oHost: