diff --git a/devel/pmk/Makefile b/devel/pmk/Makefile
index 14a911a105c..2e0ebac388e 100644
--- a/devel/pmk/Makefile
+++ b/devel/pmk/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/16 02:53:11 merdely Exp $
+# $OpenBSD: Makefile,v 1.10 2008/02/20 20:48:56 naddy Exp $
 
 COMMENT=		dependency configuration tool
 
 VERSION=		0.9.3
 DISTNAME=		pmk-${VERSION}
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		devel
 
 HOMEPAGE=		http://pmk.sourceforge.net/
 
-MAINTAINER=		Damien Couderc <couderc@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 52dcd8b8733..8659a85e760 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.77 2007/11/06 21:18:10 rui Exp $
+# $OpenBSD: Makefile,v 1.78 2008/02/20 20:48:56 naddy Exp $
 
 COMMENT=	mail/news client in gtk+
 
 MAJOR=		2.4
 VERSION=	${MAJOR}.5
 DISTNAME=	sylpheed-${VERSION}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=    	mail news x11
 HOMEPAGE=	http://sylpheed.sraoss.jp/en
 
-MAINTAINER=	Damien Couderc <couderc@openbsd.org>
-
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/net/xchat/Makefile b/net/xchat/Makefile
index 1bac693fbdd..6888822e0ea 100644
--- a/net/xchat/Makefile
+++ b/net/xchat/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.65 2007/12/15 21:14:22 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.66 2008/02/20 20:48:56 naddy Exp $
 
 COMMENT=	GTK+2 IRC client
 
 MAJOR=		2.8
 VERSION=	${MAJOR}.4
 DISTNAME=	xchat-${VERSION}
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	net x11
 
 HOMEPAGE=	http://www.xchat.org/
 
-MAINTAINER=	Damien Couderc <couderc@openbsd.org>
-
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/golem/Makefile b/x11/golem/Makefile
index 77692fdc2fd..6a93b2e78a8 100644
--- a/x11/golem/Makefile
+++ b/x11/golem/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/15 20:04:20 merdely Exp $
+# $OpenBSD: Makefile,v 1.10 2008/02/20 20:48:56 naddy Exp $
 
 COMMENT=		fast and light window manager with plug-ins
 
 DISTNAME=		golem-0.0.5
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=     	x11
 
 HOMEPAGE=		http://golem.sourceforge.net/
 
-MAINTAINER=		Damien Couderc <couderc@openbsd.org>
-
 # License: BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes