diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile
index cc921df9ce3..6c95f172551 100644
--- a/archivers/makeself/Makefile
+++ b/archivers/makeself/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.6 2007/09/15 10:14:33 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2010/09/22 09:02:42 jasper Exp $
 # Original from: Stephane Peter <megastep@megastep.org>
 
 COMMENT=	script generating a self-extractible .tgz from a directory
 
 DISTNAME=		makeself
 PKGNAME=		makeself-1.5.5
+REVISION=		0
 CATEGORIES=		archivers misc
 
 HOMEPAGE=		http://www.megastep.org/makeself/
 
-MAINTAINER=		Reinhard J. Sammer <reinhard@openbsd.org>
-
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/devel/jakarta-servletapi/Makefile b/devel/jakarta-servletapi/Makefile
index 2c9bdd654f2..751b3174cb5 100644
--- a/devel/jakarta-servletapi/Makefile
+++ b/devel/jakarta-servletapi/Makefile
@@ -1,18 +1,16 @@
-# $OpenBSD: Makefile,v 1.19 2009/11/09 11:03:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2010/09/22 09:02:42 jasper Exp $
 
 COMMENT=	implementation of the JSP and Java Servlet APIs
 
 V=		3.2.4
 DISTNAME=	jakarta-servletapi-${V}
-PKGNAME=	${DISTNAME}p9
+REVISION=	10
 CATEGORIES=	www devel
 MASTER_SITES=	http://archive.apache.org/dist/jakarta/tomcat-3/archive/v${V}/bin/
 EXTRACT_SUFX=	.zip
 
 HOMEPAGE=	http://jakarta.apache.org/
 
-MAINTAINER=	Reinhard J. Sammer <reinhard@openbsd.org>
-
 # Apache Software License
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/misc/ttyrec/Makefile b/misc/ttyrec/Makefile
index 313920c3a41..a4585ba9bb5 100644
--- a/misc/ttyrec/Makefile
+++ b/misc/ttyrec/Makefile
@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.10 2009/03/23 17:42:40 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2010/09/22 09:02:42 jasper Exp $
 
 COMMENT=	tty recorder
 
 DISTNAME=	ttyrec-1.0.8
-PKGNAME=	${DISTNAME}p0
+REVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	http://0xcc.net/ttyrec/
 
-MAINTAINER=	Reinhard J. Sammer <reinhard@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/misc/xnc/Makefile b/misc/xnc/Makefile
index e93c6468f74..de6c1df8e36 100644
--- a/misc/xnc/Makefile
+++ b/misc/xnc/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.20 2009/08/10 06:33:02 kili Exp $
+# $OpenBSD: Makefile,v 1.21 2010/09/22 09:02:42 jasper Exp $
 
 COMMENT=	filemanager for X Window
 
 DISTNAME=	xnc-4.4.7
-PKGNAME=	$(DISTNAME)p1
+REVISION=	2
 DISTFILES=	${DISTNAME}.src${EXTRACT_SUFX}
 SHARED_LIBS=	xncaqua	1.0 \
 		xncfive	1.0
 
 CATEGORIES=	misc x11
 
-MAINTAINER=	Reinhard J. Sammer <reinhard@openbsd.org>
-
 HOMEPAGE=	http://xnc.dubna.su
 
 MASTER_SITES=	${HOMEPAGE}/src/
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 1a481fc1047..3ce1fc74234 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.72 2010/07/08 17:01:57 pea Exp $
+# $OpenBSD: Makefile,v 1.73 2010/09/22 09:02:42 jasper Exp $
 
 COMMENT=	GNU privacy guard - a free PGP replacement
 
 DISTNAME=	gnupg-1.4.10
-PKGNAME=	${DISTNAME}p0
+REVISION=	1
 CATEGORIES=	security
 
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/ \
@@ -19,8 +19,6 @@ MASTER_SITES0=	ftp://ftp.gnupg.dk/pub/contrib-dk/
 
 HOMEPAGE=	http://www.gnupg.org/
 
-MAINTAINER=	Reinhard J. Sammer <reinhard@openbsd.org>
-
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/security/smbsniff/Makefile b/security/smbsniff/Makefile
index beeb2a71ef1..4b4decbcdf1 100644
--- a/security/smbsniff/Makefile
+++ b/security/smbsniff/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.7 2007/09/17 14:14:25 merdely Exp $
+# $OpenBSD: Makefile,v 1.8 2010/09/22 09:02:42 jasper Exp $
 
 COMMENT=	sniffer for LanManager environment (ms/samba workstations)
 DISTNAME=	smbsniff-0.0.1b
-PKGNAME=	${DISTNAME}p0
+REVISION=	1
 CATEGORIES=	security net
 
 MASTER_SITES=	${HOMEPAGE}/download/
 
 HOMEPAGE=	http://www.hsc.fr/ressources/outils/smbsniff
 
-MAINTAINER=	Reinhard J. Sammer <reinhard@openbsd.org>
-
 PERMIT_PACKAGE_CDROM=	Yes 
 PERMIT_PACKAGE_FTP=	Yes 
 PERMIT_DISTFILES_CDROM=	Yes