diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index d761700e39c..cc9758195fd 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -1,18 +1,16 @@
-# $OpenBSD: Makefile,v 1.2 2007/11/13 14:06:21 steven Exp $
+# $OpenBSD: Makefile,v 1.3 2008/02/01 20:26:42 martynas Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	document centric objects and utilities
 
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 GNOME_PROJECT=	goffice
 GNOME_VERSION=	0.2.2
 V=		${GNOME_VERSION}
 SHARED_LIBS +=	goffice-1            0.0      # .2.2
 CATEGORIES=	devel
 
-MAINTAINER=	Martynas Venckus <martynas@openbsd.org>
-
 # LGPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index 9a64aaff0fe..602afc4c23a 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.12 2007/12/10 21:07:51 martynas Exp $
+# $OpenBSD: Makefile,v 1.13 2008/02/01 20:26:42 martynas Exp $
 
 COMMENT=	ORBit2 Python bindings
 
 V=		2.14.3
 DISTNAME=	pyorbit-${V}
-PKGNAME=	py-orbit-${V}p1
+PKGNAME=	py-orbit-${V}p2
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.pygtk.org/
 
-MAINTAINER=	Martynas Venckus <martynas@openbsd.org>
-
 # LGPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/misc/delay/Makefile b/misc/delay/Makefile
index cdcc1347e74..34e8b69c75a 100644
--- a/misc/delay/Makefile
+++ b/misc/delay/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.16 2007/09/15 23:54:16 merdely Exp $
+# $OpenBSD: Makefile,v 1.17 2008/02/01 20:26:42 martynas Exp $
 # $FreeBSD: Makefile,v 1.1.1.1 1999/03/05 17:07:28 nectar Exp $
 
 COMMENT=	delay program with feedback to the user
 
 DISTNAME=	delay-1.6
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	misc
 MASTER_SITES=	${HOMEPAGE}dl/
 
 HOMEPAGE=	http://onegeek.org/~tom/software/delay/
 
-MAINTAINER=	Martynas Venckus <martynas@openbsd.org>
-
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/productivity/wyrd/Makefile b/productivity/wyrd/Makefile
index 93da4cdbc3d..1ec34d7dfba 100644
--- a/productivity/wyrd/Makefile
+++ b/productivity/wyrd/Makefile
@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.7 2007/12/12 22:11:51 okan Exp $
+# $OpenBSD: Makefile,v 1.8 2008/02/01 20:26:42 martynas Exp $
 
 COMMENT=		curses calendar front-end to remind
 
 DISTNAME=		wyrd-1.4.3
+PKGNAME=		${PKGNAME}p0
 CATEGORIES=		productivity
 
 HOMEPAGE=		http://www.eecs.umich.edu/~pelzlpj/wyrd/
 
-MAINTAINER=		Martynas Venckus <martynas@openbsd.org>
+MAINTAINER=		Okan Demirmen <okan@openbsd.org>
 
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/x11/gnome/file-roller/Makefile b/x11/gnome/file-roller/Makefile
index f4b9abc89d5..cb241e1f546 100644
--- a/x11/gnome/file-roller/Makefile
+++ b/x11/gnome/file-roller/Makefile
@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.5 2008/02/01 13:57:33 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2008/02/01 20:26:42 martynas Exp $
 
 COMMENT=		archive manager for GNOME
 
 GNOME_PROJECT=		file-roller
 GNOME_VERSION=		2.20.3
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		archivers
 
-MAINTAINER=		Martynas Venckus <martynas@openbsd.org>
-
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes