diff --git a/net/nfr/Makefile b/net/nfr/Makefile
index a85869b269a..e204bee87a5 100644
--- a/net/nfr/Makefile
+++ b/net/nfr/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1998-Jul-4
 # Whom:			dugsong@OpenBSD.ORG
 #
-# $OpenBSD: Makefile,v 1.4 1999/03/06 22:51:40 dugsong Exp $
+# $OpenBSD: Makefile,v 1.5 1999/03/27 17:06:25 niklas Exp $
 
 DISTNAME=		nfr-2.0.3-research-src
 PKGNAME=		nfr-2.0.3
@@ -41,7 +41,7 @@ pre-install:
 	@${CP} ${FILESDIR}/createuser ${PREFIX}/nfr/bin
 
 post-install:
-	sh ${PKGDIR}/INSTALL nfr POST-INSTALL
+	PREFIX=${PREFIX} sh ${PKGDIR}/INSTALL nfr POST-INSTALL
 
 pre-deinstall:
 	sh ${PKGDIR}/DEINSTALL
diff --git a/net/nfr/files/createuser b/net/nfr/files/createuser
index c0fbf9ffc5e..54a83bacb97 100755
--- a/net/nfr/files/createuser
+++ b/net/nfr/files/createuser
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $OpenBSD: createuser,v 1.2 1999/03/06 22:51:40 dugsong Exp $
+# $OpenBSD: createuser,v 1.3 1999/03/27 17:06:25 niklas Exp $
 #
 # Create the NFR user and group, if they don't already exist.
 
@@ -37,7 +37,7 @@ else {
     }
     ($null, $null, $nfr_gid) = getgrnam("nfr");
     print "Creating NFR user 'nfr' with uid $nfr_uid, gid $nfr_gid\n";
-    system( "/usr/bin/chpass -a \"nfr:*:$nfr_uid:$nfr_gid:\:\:\:Network Flight Recorder:$nfr_home:/sbin/nologin\"" );
+    system( "/usr/bin/chpass -l -a \"nfr:*:$nfr_uid:$nfr_gid:\:\:\:Network Flight Recorder:$nfr_home:/sbin/nologin\"" );
 }
 
 print("Using NFR user 'nfr' with uid $nfr_uid, gid $nfr_gid, and homedir $nfr_home\n\n");