diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile
index 1f3051a240c..4178d2c9783 100644
--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.9 2010/11/26 07:18:59 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2010/12/05 18:24:33 jasper Exp $
 
 COMMENT-main=		JDBC Driver for PostgreSQL
 COMMENT-docs=		API docs for PostgreSQL JDBC Driver
 
 V=			8.2-505
 DISTNAME=		postgresql-jdbc-$V
-PKGNAME-main=		postgresql-jdbc-${V:S/-/./}p2
+PKGNAME-main=		postgresql-jdbc-${V:S/-/./}
+REVISION-main=		2
 PKGNAME-docs=		postgresql-jdbc-docs-${V:S/-/./}
 PKG_ARCH-docs=		*
 CATEGORIES=		databases java
diff --git a/databases/qt3-sqlite3-plugin/Makefile b/databases/qt3-sqlite3-plugin/Makefile
index c5990bbdac6..315768abbba 100644
--- a/databases/qt3-sqlite3-plugin/Makefile
+++ b/databases/qt3-sqlite3-plugin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/11/15 00:22:53 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2010/12/05 18:24:33 jasper Exp $
 
 SHARED_ONLY=	Yes
 COMMENT=	qt3 sqlite3 plugin
@@ -7,12 +7,12 @@ CATEGORIES=	databases devel x11
 HOMEPAGE=	http://kde-apps.org/content/show.php?content=23011
 MASTER_SITES=	http://kde-apps.org/CONTENT/content-files/
 
-P=		qt-sqlite3-0.2
+V=		0.2
+DISTNAME=	23011-qt-sqlite3-$V
+PKGNAME=	qt3-sqlite3-$V
+REVISION=	2
 
-DISTNAME=	23011-$P
-PKGNAME=	qt3-sqlite3-0.2p2
-
-WRKDIST=	${WRKDIR}/$P
+WRKDIST=	${WRKDIR}/qt3-sqlite3-$V}
 
 MODULES=	x11/qt3
 
diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile
index 6e7d19758a7..18fa2851ee2 100644
--- a/devel/atlas/Makefile
+++ b/devel/atlas/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2010/10/24 21:10:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2010/12/05 18:24:33 jasper Exp $
 
 COMMENT=	C++ reference implementation of the Atlas protocol
 
 VERSION=	0.4.3.1
 DISTNAME=	Atlas-C++-${VERSION}
-PKGNAME=	${DISTNAME:S/C++-//:L}p2
+PKGNAME=	${DISTNAME:S/C++-//:L}
+REVISION=	2
 SHARED_LIBS +=	Atlas                2.0      # .1.1
 SHARED_LIBS +=	AtlasObjects         2.0      # .1.1
 SHARED_LIBS +=	AtlasObjectsEntity   2.0      # .1.1
diff --git a/devel/dtc/Makefile b/devel/dtc/Makefile
index 6e17830aeae..1d539f31275 100644
--- a/devel/dtc/Makefile
+++ b/devel/dtc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2010/11/15 19:45:57 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2010/12/05 18:24:33 jasper Exp $
 
 COMMENT=		Device Tree Compiler
 
 DISTNAME=		dtc-0.1
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 
 CATEGORIES=		sysutils devel
 
diff --git a/devel/eclipse/plugins/epic/Makefile b/devel/eclipse/plugins/epic/Makefile
index d9b108a8a77..42c6f11754a 100644
--- a/devel/eclipse/plugins/epic/Makefile
+++ b/devel/eclipse/plugins/epic/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2010/11/26 07:19:00 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2010/12/05 18:24:33 jasper Exp $
 
 COMMENT=		Perl plugin for Eclipse IDE
 
 V=			0.5.33
-DISTNAME=		org.epic.updatesite_0.5.33_20070406
-PKGNAME=		eclipse-plugin-epic-${V}p0
+DISTNAME=		org.epic.updatesite_${V}_20070406
+PKGNAME=		eclipse-plugin-epic-${V}
+REVISION=		0
 CATEGORIES=		devel/eclipse/plugins perl5
 
 HOMEPAGE=		http://e-p-i-c.sourceforge.net/
diff --git a/devel/libproplist/Makefile b/devel/libproplist/Makefile
index 5d8053bffc8..75d3f6452eb 100644
--- a/devel/libproplist/Makefile
+++ b/devel/libproplist/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.24 2007/09/16 02:53:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.25 2010/12/05 18:24:33 jasper Exp $
 
 COMMENT=	GNUstep/OPENSTEP property lists compatibility library
 
-DISTNAME=	libPropList-0.10.1
-PKGNAME=	libproplist-0.10.1p1
+V=		0.10.1
+DISTNAME=	libPropList-${V}
+PKGNAME=	libproplist-${V}
+REVISION=	1
 SHARED_LIBS=		PropList 2.2
 MODGNU_SHARED_LIBS=	PropList ''
 
diff --git a/devel/mysql++/Makefile b/devel/mysql++/Makefile
index e6ffc7f3f3e..d97447174fe 100644
--- a/devel/mysql++/Makefile
+++ b/devel/mysql++/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2010/11/15 19:46:00 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2010/12/05 18:24:33 jasper Exp $
 
 SHARED_ONLY =		Yes
 
@@ -7,7 +7,8 @@ COMMENT-docs =		C++ API for MySQL documentation
 
 VERSION =		3.0.9
 DISTNAME =		mysql++-${VERSION}
-PKGNAME-main =		${DISTNAME}p0
+PKGNAME-main =		${DISTNAME}
+REVISION-main =		0
 PKGNAME-docs =		mysql++-docs-${VERSION}
 SHARED_LIBS += mysqlpp	4.0	# 3
 CATEGORIES =		devel
diff --git a/games/alephone/scenarios/marathon/Makefile b/games/alephone/scenarios/marathon/Makefile
index 4d1817a73b5..84823954625 100644
--- a/games/alephone/scenarios/marathon/Makefile
+++ b/games/alephone/scenarios/marathon/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.5 2010/04/15 14:11:01 ajacoutot Exp $
+#	$OpenBSD: Makefile,v 1.6 2010/12/05 18:24:33 jasper Exp $
 PKG_ARCH =	*
 
 COMMENT =	marathon one data files
 V =		0.0.20090509
 DISTNAME =	marathon-${V}
-PKGNAME =	marathon-${V}p0
+REVISION =	0
 HOMEPAGE =	http://source.bungie.org/get/
 
 DISTFILES =	M1A1.zip
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 5e183b3c116..ffc059a8b4b 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/11/26 07:20:12 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2010/12/05 18:24:33 jasper Exp $
 
 MULTI_PACKAGES=	-main -themes
 
@@ -7,7 +7,8 @@ COMMENT-themes=	collection of gtetrinet themes
 DISTNAME=	gtetrinet-0.7.11
 PKGNAME-main=	${DISTNAME}
 REVISION-main=	11
-PKGNAME-themes=	gtetrinet-themes-20070623p1
+PKGNAME-themes=	gtetrinet-themes-20070623
+REVISION-themes=1
 CATEGORIES=	x11 games
 
 HOMEPAGE=	http://gtetrinet.sourceforge.net/
diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile
index ce6cf9e3f01..2bcb6048483 100644
--- a/games/xbomber/Makefile
+++ b/games/xbomber/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/24 21:19:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2010/12/05 18:24:33 jasper Exp $
 
 COMMENT=		colorful game where you blow other people/robots up
 
 VERSION=		0.8
 DISTNAME=		xbomber.${VERSION}
-PKGNAME=		xbomber-${VERSION}p1
+PKGNAME=		xbomber-${VERSION}
+REVISION=		1
 CATEGORIES=		games x11
 
 HOMEPAGE=		http://www.newbreedsoftware.com/xbomber/
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index fc53aa086e8..5073689ebe6 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.26 2010/10/24 21:19:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2010/12/05 18:24:33 jasper Exp $
 
 COMMENT=	Mr Do video arcade game for X11
 
-DISTNAME=	xmris.4.04
-PKGNAME=	xmris-4.04p1
+V=		4.04
+DISTNAME=	xmris.${V}
+PKGNAME=	xmris-${V}
+REVISION=	1
 CATEGORIES=	games
 
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=games/}
diff --git a/graphics/wmgrabimage/Makefile b/graphics/wmgrabimage/Makefile
index 8ea16007f0b..b663e7ea909 100644
--- a/graphics/wmgrabimage/Makefile
+++ b/graphics/wmgrabimage/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2010/11/17 08:05:16 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2010/12/05 18:24:33 jasper Exp $
 
 COMMENT=		wm-dockapp; WWW image monitor
 
 DISTNAME=		wmGrabImage-0.72
-PKGNAME=		${DISTNAME:L}p2
+PKGNAME=		${DISTNAME:L}
+REVISION=		2
 CATEGORIES=		graphics x11 x11/windowmaker
 EXTRACT_SUFX=		.tgz
 
diff --git a/korean/baekmuk-fonts/Makefile b/korean/baekmuk-fonts/Makefile
index c8056380e92..439d9b6d392 100644
--- a/korean/baekmuk-fonts/Makefile
+++ b/korean/baekmuk-fonts/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2010/10/24 21:23:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2010/12/05 18:24:33 jasper Exp $
 
 COMMENT= 	extra Korean fonts
 
-PKGNAME=	baekmuk-fonts-2.0p0
-DISTNAME=	baekmuk-2.0
+V=		2.0
+DISTNAME=	baekmuk-${V}
+PKGNAME=	baekmuk-fonts-${V}
+REVISION=	0
 CATEGORIES=	korean x11
 
 MASTER_SITES=	ftp://ftp.kr.freebsd.org/pub/FreeBSD/distfiles/ \
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index c290d882138..f19f62efbd9 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/11/19 07:23:05 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2010/12/05 18:24:33 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,8 @@ COMMENT=	cache saver plugin for Claws Mail
 
 VERSION=	0.10.9
 DISTNAME=	cachesaver-${VERSION}
-PKGNAME=	claws-mail-cachesaver-${VERSION}p3
+PKGNAME=	claws-mail-cachesaver-${VERSION}
+REVISION=	3
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 CATEGORIES=	mail
 DIST_SUBDIR=	claws
diff --git a/textproc/aspell/dicts/Makefile.inc b/textproc/aspell/dicts/Makefile.inc
index 2f3fbc5cbc8..557ba75bb29 100644
--- a/textproc/aspell/dicts/Makefile.inc
+++ b/textproc/aspell/dicts/Makefile.inc
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.11 2010/11/20 19:56:47 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.12 2010/12/05 18:24:33 jasper Exp $
 
 # Check individual packages for overrides when bumping this!
-PKGNAME?=	${DISTNAME:C/-([0-9])$/_\1/}p1
+PKGNAME?=	${DISTNAME:C/-([0-9])$/_\1/}
+REVISION?=	1
 
 DIST_SUBDIR?=	aspell
 
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index 5c81523e6c6..375bf16ba33 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2010/11/22 09:38:08 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2010/12/05 18:24:33 jasper Exp $
 
 COMMENT=	LaTeX to html translator
 
 CATEGORIES=	textproc print
 
-V=1.06
 # Q Licence 1.0 + LGPL for parts of the runtime
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
@@ -14,8 +13,8 @@ WANTLIB=		c m
 
 BUILD_DEPENDS=	lang/ocaml
 
-DISTNAME=	hevea-$V
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	hevea-1.06
+REVISION=	1
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/moscova/hevea/
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-manual${EXTRACT_SUFX}
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 74a22c0209f..92eb5ed98e2 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2010/11/20 19:56:48 espie Exp $
+# $OpenBSD: Makefile,v 1.53 2010/12/05 18:24:33 jasper Exp $
 
 COMMENT-main=		interactive spelling checker
 COMMENT-dutch=		ispell dictionary for Dutch
@@ -58,11 +58,13 @@ EXTRACT_ONLY=	${DISTNAME}.tar.gz \
 
 SUBST_VARS+=	VERSION
 
-PKGNAME-main=	${DISTNAME}p5
+PKGNAME-main=	${DISTNAME}
+REVISION-main=	5
 MULTI_PACKAGES=	-main -dutch -french -german -swedish -russian -portuguese \
 		-slovak -spanish
 .for i in ${MULTI_PACKAGES}
-PKGNAME$i?=	ispell$i-${VERSION}p5
+PKGNAME$i?=	ispell$i-${VERSION}
+REVISION$i?=	5
 .endfor
 
 # ispell: BSD-like