diff --git a/security/ADMfzap/Makefile b/security/ADMfzap/Makefile
index a5d5aebc244..69ea649232b 100644
--- a/security/ADMfzap/Makefile
+++ b/security/ADMfzap/Makefile
@@ -1,37 +1,33 @@
-# Makefile for:		ADMfzap
-# Version required:	0.1
-# Date created:		14 Mar 1999
-# Whom:			dugsong@monkey.org
-#
-# $OpenBSD: Makefile,v 1.5 2002/03/21 21:25:51 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2002/03/24 07:30:43 jsyn Exp $
 
-COMMENT=	"connect() and bind() wrapper to evade packet filtering"
+COMMENT=		"connect() and bind() wrapper to evade packet filtering"
 
-PKGNAME=	ADMfzap-0.1
-CATEGORIES=	security
-MAINTAINER=	Dug Song <dugsong@monkey.org>
-DISTNAME=	ADMfzap
-NEED_VERSION=	1.515
+DISTNAME=		ADMfzap
+PKGNAME=        	ADMfzap-0.1
+CATEGORIES=		security
+NEED_VERSION=		1.515
 
-MASTER_SITES=	http://ADM.isp.at/ADM/ \
-		ftp://ADM.isp.at/ADM/
+MAINTAINER=     	Jason Peel <jsyn@openbsd.org>
 
-MAKE_ENV+=	LIB_PATH=`/bin/ls -1 /usr/lib/libc.so.* | tail -1`
+PERMIT_PACKAGE_CDROM=	"no license"
+PERMIT_PACKAGE_FTP=	"no license"
+PERMIT_DISTFILES_CDROM=	"no license"
+PERMIT_DISTFILES_FTP=	"no license"
 
-ALL_TARGET=	openbsd
+MASTER_SITES=   	ftp://adm.freelsd.net/pub/ADM/ \
+                	http://adm.freelsd.net/ADM/
 
-# these should really just be defaults.
-PERMIT_PACKAGE_CDROM=	yes
-PERMIT_PACKAGE_FTP=	yes
-PERMIT_DISTFILES_CDROM=	yes
-PERMIT_DISTFILES_FTP=	yes
+MAKE_ENV+=      	LIB_PATH=`/bin/ls -1 /usr/lib/libc.so.* | tail -1`
+
+ALL_TARGET=     	openbsd
+NO_REGRESS=		Yes
 
 post-build:
-		sed "s%y0y0y0%${PREFIX}/lib/libfzap.so%g" \
-		    ${FILESDIR}/ADMfzap > ${WRKSRC}/ADMfzap
+	sed "s%y0y0y0%${PREFIX}/lib/libfzap.so%g" \
+		${FILESDIR}/ADMfzap > ${WRKSRC}/ADMfzap
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/fzap.so ${PREFIX}/lib/libfzap.so
-		${INSTALL_SCRIPT} ${WRKSRC}/ADMfzap ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/fzap.so ${PREFIX}/lib/libfzap.so
+	${INSTALL_SCRIPT} ${WRKSRC}/ADMfzap ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/security/ADMfzap/files/ADMfzap b/security/ADMfzap/files/ADMfzap
index cfbb36c00d6..cdc2649ba6f 100755
--- a/security/ADMfzap/files/ADMfzap
+++ b/security/ADMfzap/files/ADMfzap
@@ -1,10 +1,11 @@
 #!/bin/sh
+# $OpenBSD: ADMfzap,v 1.2 2002/03/24 07:30:43 jsyn Exp $
 #
 # ADMfzap wrapper.
 #
 # Dug Song <dugsong@monkey.org>
 #
-# $Id: ADMfzap,v 1.1.1.1 2000/04/06 20:45:01 dugsong Exp $
+# $Id: ADMfzap,v 1.2 2002/03/24 07:30:43 jsyn Exp $
 
 LIBFZAP=y0y0y0
 
diff --git a/security/ADMfzap/patches/patch-aa b/security/ADMfzap/patches/patch-Makefile
similarity index 84%
rename from security/ADMfzap/patches/patch-aa
rename to security/ADMfzap/patches/patch-Makefile
index 61443473e61..baf2cac52af 100644
--- a/security/ADMfzap/patches/patch-aa
+++ b/security/ADMfzap/patches/patch-Makefile
@@ -1,3 +1,4 @@
+$OpenBSD: patch-Makefile,v 1.1 2002/03/24 07:30:42 jsyn Exp $
 --- Makefile.orig	Mon Feb 15 18:49:35 1999
 +++ Makefile	Thu Apr  6 15:37:46 2000
 @@ -20,8 +20,8 @@
diff --git a/security/ADMfzap/patches/patch-ac b/security/ADMfzap/patches/patch-fzap_c
similarity index 93%
rename from security/ADMfzap/patches/patch-ac
rename to security/ADMfzap/patches/patch-fzap_c
index 121724f48d0..2d3314594d7 100644
--- a/security/ADMfzap/patches/patch-ac
+++ b/security/ADMfzap/patches/patch-fzap_c
@@ -1,3 +1,4 @@
+$OpenBSD: patch-fzap_c,v 1.1 2002/03/24 07:30:43 jsyn Exp $
 --- fzap.c.orig	Mon Feb 15 17:50:46 1999
 +++ fzap.c	Thu Apr  6 15:52:19 2000
 @@ -40,6 +40,7 @@
diff --git a/security/ADMfzap/patches/patch-ab b/security/ADMfzap/patches/patch-fzap_h
similarity index 94%
rename from security/ADMfzap/patches/patch-ab
rename to security/ADMfzap/patches/patch-fzap_h
index 64d2f05badc..ca2cbcc9a76 100644
--- a/security/ADMfzap/patches/patch-ab
+++ b/security/ADMfzap/patches/patch-fzap_h
@@ -1,3 +1,4 @@
+$OpenBSD: patch-fzap_h,v 1.1 2002/03/24 07:30:43 jsyn Exp $
 --- fzap.h.orig	Mon Feb 15 18:50:43 1999
 +++ fzap.h	Thu Apr  6 15:51:10 2000
 @@ -1,8 +1,9 @@
diff --git a/security/ADMfzap/pkg/DESCR b/security/ADMfzap/pkg/DESCR
index 3765cd3a6f6..3d3a4fdcc16 100644
--- a/security/ADMfzap/pkg/DESCR
+++ b/security/ADMfzap/pkg/DESCR
@@ -15,7 +15,6 @@
 
 
 ADMfzap makes all (or most of) your connect() and bind()
-calls originating from port 20 (tcp, ftp-data) or 53 (udp,
-dns). Alternatly, the source port can also be configured
+calls originate from port 20 (tcp, ftp-data) or 53 (udp,
+dns). Alternatively, the source port can also be configured
 via the environment variable $LOPORT.
-
diff --git a/security/ADMfzap/pkg/PLIST b/security/ADMfzap/pkg/PLIST
index 3d197753eae..d5ac88c86f9 100644
--- a/security/ADMfzap/pkg/PLIST
+++ b/security/ADMfzap/pkg/PLIST
@@ -1,2 +1,3 @@
-lib/libfzap.so
+@comment $OpenBSD: PLIST,v 1.2 2002/03/24 07:30:43 jsyn Exp $
 bin/ADMfzap
+lib/libfzap.so