diff --git a/ChangeLog b/ChangeLog
index 76ad58a..527e419 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20010427
  - (bal) Fixed uidswap.c so it should work on non-posix complient systems.
    patch based on 2.5.2 version by djm.
+ - (bal) Build manpages and config files once unless changed.  Patch by
+   Carson Gaspar <carson@taltos.org>
 
 20010425
  - OpenBSD CVS Sync
@@ -5256,4 +5258,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1172 2001/04/26 23:03:37 mouring Exp $
+$Id: ChangeLog,v 1.1173 2001/04/27 00:31:07 mouring Exp $
diff --git a/Makefile.in b/Makefile.in
index 51adfac..dda7b48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.173 2001/04/21 21:31:53 tim Exp $
+# $Id: Makefile.in,v 1.174 2001/04/27 00:31:08 mouring Exp $
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -51,10 +51,12 @@
 
 SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-sia.o sshpty.o sshlogin.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o
 
-MANPAGES	= scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1
+MANPAGES	= scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out
+MANPAGES_IN	= scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1
 MANTYPE		= @MANTYPE@
 
-CONFIGFILES=sshd_config ssh_config primes
+CONFIGFILES=sshd_config.out ssh_config.out primes.out
+CONFIGFILES_IN=sshd_config ssh_config primes
 
 PATHSUBS	= \
 	-D/etc/ssh_config=$(sysconfdir)/ssh_config \
@@ -121,20 +123,21 @@
 logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o
 	$(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS)
 
-$(MANPAGES)::
+$(MANPAGES): $(MANPAGES_IN)
 	if test "$(MANTYPE)" = "cat"; then \
-		manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]$$/\.0/'`; \
+		manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]\.out$$/\.0/'`; \
 	else \
-		manpage=$(srcdir)/$@; \
+		manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \
 	fi; \
 	if test "$(MANTYPE)" = "man"; then \
-		$(FIXPATHSCMD) $${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@.out; \
+		$(FIXPATHSCMD) $${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@; \
 	else \
-		$(FIXPATHSCMD) $${manpage} > $@.out; \
+		$(FIXPATHSCMD) $${manpage} > $@; \
 	fi
 
-$(CONFIGFILES)::
-	$(FIXPATHSCMD) $(srcdir)/$@ > $@.out
+$(CONFIGFILES): $(CONFIGFILES_IN)
+	conffile=`echo $@ | sed 's/.out$$//'`; \
+	$(FIXPATHSCMD) $(srcdir)/$${conffile} > $@
 
 clean:
 	(cd openbsd-compat; $(MAKE) clean)
@@ -151,7 +154,7 @@
 	rm -f configure config.h.in *.0
 
 catman-do:
-	@for f in $(MANPAGES) ; do \
+	@for f in $(MANPAGES_IN) ; do \
 		base=`echo $$f | sed 's/\..*$$//'` ; \
 		echo "$$f -> $$base.0" ; \
 		nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \