diff --git a/infrastructure/build/bundle-readmes b/infrastructure/build/bundle-readmes
index f8186caa5e5..df347fc2408 100755
--- a/infrastructure/build/bundle-readmes
+++ b/infrastructure/build/bundle-readmes
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: bundle-readmes,v 1.2 1999/10/07 14:22:36 espie Exp $
+# $OpenBSD: bundle-readmes,v 1.3 2003/08/02 10:53:52 espie Exp $
 # Copyright (c) 1999
 # Marc Espie.  All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -28,4 +28,4 @@
 PORTSDIR=/usr/ports
 cd $PORTSDIR &&
 make readmes &&
-tar -zcf ports-readmes.tar.gz -s/^\./ports/ `cd $PORTSDIR && find . -name README.html`
+tar -zcf ports-readmes.tar.gz -s/^\./ports/ `cd $PORTSDIR && find . -type d -name w-\* -prune -o -type f -name \*.html -print`
diff --git a/infrastructure/build/check_register b/infrastructure/build/check_register
index 85edff0ce22..83b8bdf063a 100755
--- a/infrastructure/build/check_register
+++ b/infrastructure/build/check_register
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: check_register,v 1.1 2001/04/08 17:01:31 espie Exp $
+# $OpenBSD: check_register,v 1.2 2003/08/02 10:53:52 espie Exp $
 # Copyright (c) 2001
 # Marc Espie.  All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -33,18 +33,19 @@
 
 known1=`mktemp ${TMPDIR}/known.XXXXXXXXX`
 known2=`mktemp ${TMPDIR}/known.XXXXXXXXX`
-cd ${PORTSDIR} && make show ECHO_MSG=: VARNAME=FULLPKGPATH | tee ${known1}
+cd ${PORTSDIR} && make show=FULLPKGPATH ECHO_MSG=: | tee ${known1}
 sort -o ${known1} -u ${known1}
 
 cd ${PORTSDIR} && find . -path ./distfiles -prune -o \
-	-path ./packages\* -prune -o -path ./logs\* -prune -o \
-	-name work\* -prune -o -name Makefile -print | \
+	-path ./packages\* -prune -o -path ./logs\* -prune -o 
+	-path ./bulk\* -prune -o \
+	-name w-\* -prune -o -name Makefile -print | \
 	xargs fgrep -l bsd.port.mk| \
 	while read f
 	do
 		d=`dirname $f`
 		echo $d
-		cd ${PORTSDIR} && cd $d && make show VARNAME=FULLPKGPATH >>${known2}
+		cd ${PORTSDIR} && cd $d && make show=FULLPKGPATH >>${known2}
 	done
 sort -o ${known2} -u ${known2}
 diff $diffopts ${known1} ${known2}