diff --git a/mail/checkpassword/Makefile b/mail/checkpassword/Makefile
index d2103b5d595..73c1d96330d 100644
--- a/mail/checkpassword/Makefile
+++ b/mail/checkpassword/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2000/03/13 09:43:27 camield Exp $
+# $OpenBSD: Makefile,v 1.4 2000/04/26 14:43:51 camield Exp $
 
 DISTNAME=	checkpassword-0.81
 HOMEPAGE=	http://cr.yp.to/checkpwd.html
@@ -21,7 +21,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 NO_CONFIGURE=	Yes
-ALL_TARGET=	default WRKINST=${WRKINST}
+ALL_TARGET=	default
 INSTALL_TARGET=	setup check
 
 FAKE=	Yes
@@ -30,4 +30,7 @@ pre-build:
 	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	@echo ${PREFIX} > ${WRKSRC}/conf-home
 
+pre-install:
+	@echo ${PREFIX} > ${WRKSRC}/conf-home
+
 .include <bsd.port.mk>
diff --git a/mail/checkpassword/patches/patch-Makefile b/mail/checkpassword/patches/patch-Makefile
index 7b7f69ab37a..0f0868992b1 100644
--- a/mail/checkpassword/patches/patch-Makefile
+++ b/mail/checkpassword/patches/patch-Makefile
@@ -1,15 +1,25 @@
-$OpenBSD: patch-Makefile,v 1.1 2000/03/13 09:43:27 camield Exp $
+$OpenBSD: patch-Makefile,v 1.2 2000/04/26 14:43:52 camield Exp $
 
-Needed for fake installation.
+Needed for fake installation. This way the installer can easily be
+rebuilt with the fake prefix, without rebuilding _everything_.
 
---- Makefile.orig	Mon Mar 13 10:36:02 2000
-+++ Makefile	Mon Mar 13 10:36:22 2000
-@@ -14,7 +14,7 @@
+--- Makefile.orig	Sat Nov 21 21:29:52 1998
++++ Makefile	Wed Apr 26 16:41:04 2000
+@@ -29,7 +29,7 @@
+ 	./compile byte_cr.c
  
- auto_home.c: \
- auto-str conf-home
--	./auto-str auto_home `head -1 conf-home` > auto_home.c
-+	./auto-str auto_home ${WRKINST}`head -1 conf-home` > auto_home.c
+ check: \
+-it instcheck
++instcheck
+ 	./instcheck
  
- auto_home.o: \
- compile auto_home.c
+ checkpassword: \
+@@ -187,7 +187,7 @@
+ 	rm -f tryslib.o tryslib
+ 
+ setup: \
+-it install
++install
+ 	./install
+ 
+ shadow.lib: \