Index: Makefile
===================================================================
--- Makefile	(revision 412496)
+++ Makefile	(working copy)
@@ -38,10 +38,11 @@
 
 EXTRACT_AFTER_ARGS=--exclude */lib/zlib --exclude */lib/dbm --exclude */lib/sqlite
 
-INSTALL_BINS=	certcgi certutil cmsutil crlutil derdump makepqg \
-		mangle modutil ocspclnt oidcalc p7content p7env p7sign \
-		p7verify pk12util rsaperf shlibsign signtool signver \
-		ssltap strsclnt symkeyutil vfychain vfyserv
+INSTALL_BINS=	addbuiltin atob btoa certcgi certutil cmsutil crlutil derdump \
+		httpserv makepqg mangle modutil ocspclnt oidcalc p7content \
+		p7env p7sign p7verify pk1sign pk12util pkix-errcodes pp \
+		pwdecrypt rsaperf selfserv shlibsign signtool signver ssltap \
+		strsclnt symkeyutil tstclnt vfychain vfyserv
 
 OPTIONS_DEFINE=	DEBUG
 
@@ -59,7 +60,7 @@
 CC+=	-B${LOCALBASE}/bin
 .endif
 
-check regression-test test:
+check regression-test do-test:
 	cd ${WRKSRC}/tests;	\
 		${SETENV} PATH="${BINS}/bin:${PATH}" \
 		    LD_LIBRARY_PATH="${BINS}/lib" \
@@ -90,10 +91,9 @@
 		${STAGEDIR}${PREFIX}/lib/nss
 	${INSTALL_DATA} ${BINS}/lib/libcrmf.a \
 		${STAGEDIR}${PREFIX}/lib/nss
-.for bin in ${INSTALL_BINS}
-	${INSTALL_PROGRAM} ${BINS}/bin/${bin} \
+	${INSTALL_PROGRAM} ${INSTALL_BINS:Npp:S|^|${BINS}/bin/|} \
 		${STAGEDIR}${PREFIX}/bin
-.endfor
+	${INSTALL_PROGRAM} ${BINS}/bin/pp ${STAGEDIR}${PREFIX}/bin/nss-pp
 	cd ${BINS}/lib && \
 		${TAR} -cf - *.so | ${TAR} --unlink -C ${STAGEDIR}${PREFIX}/lib/nss -xf -
 	${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${STAGEDIR}${PREFIX}/bin
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 412496)
+++ pkg-plist	(working copy)
@@ -1,8 +1,12 @@
+bin/addbuiltin
+bin/atob
+bin/btoa
 bin/certcgi
 bin/certutil
 bin/cmsutil
 bin/crlutil
 bin/derdump
+bin/httpserv
 bin/makepqg
 bin/mangle
 bin/modutil
@@ -14,7 +18,12 @@
 bin/p7sign
 bin/p7verify
 bin/pk12util
+bin/pk1sign
+bin/pkix-errcodes
+bin/nss-pp
+bin/pwdecrypt
 bin/rsaperf
+bin/selfserv
 bin/shlibsign
 bin/signtool
 bin/signver
@@ -21,6 +30,7 @@
 bin/ssltap
 bin/strsclnt
 bin/symkeyutil
+bin/tstclnt
 bin/vfychain
 bin/vfyserv
 include/nss/nss/base64.h