diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index b5dadb31dac..b470c593b2b 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2003/05/24 01:43:01 jolan Exp $
+# $OpenBSD: Makefile,v 1.23 2003/06/04 22:16:22 jolan Exp $
 
 COMMENT=	"create & extract files from DOS .ARC files"
 
@@ -11,7 +11,7 @@ EXTRACT_SUFX=   .tar.Z
 # Restrictive
 PERMIT_PACKAGE_CDROM=	"no modifications"
 PERMIT_PACKAGE_FTP=	"no modifications"
-PERMIT_DISTFILES_CDROM=	"source may not be sold"
+PERMIT_DISTFILES_CDROM=	"no fee"
 PERMIT_DISTFILES_FTP=	Yes
 
 MAKE_FLAGS=	CC="${CC}" OPT="${CFLAGS}"
diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile
index aad03925c8e..d40283f64bf 100644
--- a/archivers/makeself/Makefile
+++ b/archivers/makeself/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/01/20 19:10:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2003/06/04 22:16:22 jolan Exp $
 # Original from: Stephane Peter <megastep@megastep.org>
 
 COMMENT=	"script generating a self-extractible .tgz from a directory"
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${HOMEPAGE}
+MASTER_SITES=		${MASTER_SITE_BACKUP}
 
 EXTRACT_ONLY=
 EXTRACT_SUFX=		.gz.sh
diff --git a/archivers/nulib/Makefile b/archivers/nulib/Makefile
index fc455209bfa..c81140598f7 100644
--- a/archivers/nulib/Makefile
+++ b/archivers/nulib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2003/05/24 02:40:42 jolan Exp $
+# $OpenBSD: Makefile,v 1.22 2003/06/04 22:16:22 jolan Exp $
 
 COMMENT=	"NuFX archiver"
 
@@ -9,9 +9,9 @@ MASTER_SITES=	http://people.freebsd.org/~jseger/
 EXTRACT_SUFX=	.tar.Z
 
 # Restrictive
-PERMIT_PACKAGE_CDROM=	"May not sell"
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	"May not sell"
+PERMIT_PACKAGE_CDROM=	"no fee"
+PERMIT_PACKAGE_FTP=	"no terms"
+PERMIT_DISTFILES_CDROM=	"no fee"
 PERMIT_DISTFILES_FTP=	Yes
 
 MAKE_FLAGS=	CC="${CC}" OPTIMIZE="${CFLAGS}"
diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile
index 56aafb370df..cd3c1639f78 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/24 02:55:16 jolan Exp $
+# $OpenBSD: Makefile,v 1.6 2003/06/04 22:16:22 jolan Exp $
 
 COMMENT=	"perl interface to tar archives"
 VERSION=	0.22
@@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}
 
 MAINTAINER=	Peter Galbavy <peter.galbavy@knowtion.net>
 
-# GPL
+# Perl
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
diff --git a/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index 5f93664513a..0ae4238dcb8 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/24 02:55:16 jolan Exp $
+# $OpenBSD: Makefile,v 1.6 2003/06/04 22:16:22 jolan Exp $
 
 COMMENT=	"perl interface to ZIP files"
 DISTNAME=	Archive-Zip-1.05
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}
 
 MAINTAINER=	Peter Galbavy <peter.galbavy@knowtion.net>
 
-# GPL
+# Perl
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
diff --git a/archivers/p5-Compress-Zlib/Makefile b/archivers/p5-Compress-Zlib/Makefile
index 59db53a681a..d2dc8d4136e 100644
--- a/archivers/p5-Compress-Zlib/Makefile
+++ b/archivers/p5-Compress-Zlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2003/05/24 02:55:16 jolan Exp $
+# $OpenBSD: Makefile,v 1.32 2003/06/04 22:16:22 jolan Exp $
 
 COMMENT=	"perl interface to the zlib compression library"
 DISTNAME=	Compress-Zlib-1.19
@@ -7,7 +7,7 @@ CATEGORIES=	archivers perl5
 
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Compress/}
 
-# GPL
+# Perl
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
diff --git a/archivers/p5-IO-Zlib/Makefile b/archivers/p5-IO-Zlib/Makefile
index e805876f6ad..20c64b169de 100644
--- a/archivers/p5-IO-Zlib/Makefile
+++ b/archivers/p5-IO-Zlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/05/24 02:55:16 jolan Exp $
+# $OpenBSD: Makefile,v 1.3 2003/06/04 22:16:22 jolan Exp $
 
 COMMENT=	"IO:: style interface to Compress::Zlib"
 
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 
 MAINTAINER=	Jakob Schlyter <jakob@openbsd.org>
 
-# GPL
+# Perl
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index d970d1fec63..c34e567786d 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2003/05/24 02:40:42 jolan Exp $
+# $OpenBSD: Makefile,v 1.25 2003/06/04 22:16:22 jolan Exp $
 
 COMMENT=	"extract, view & test ACE archives"
 
@@ -6,11 +6,11 @@ DISTNAME=	unace-1.2b
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=utils/compress/}
 
-# Copyrighted but freely distributable.
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
+# Vague
+PERMIT_PACKAGE_CDROM=	"no terms"
+PERMIT_PACKAGE_FTP=	"no terms"
+PERMIT_DISTFILES_CDROM=	"unclear terms"
+PERMIT_DISTFILES_FTP=	"unclear terms"
 
 MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS} -Wall -DUNIX -DCASEINSENSE"
 MAKE_FILE=	unix/makefile