diff --git a/sysutils/gkrellm/plugins/Makefile.inc b/sysutils/gkrellm/plugins/Makefile.inc
index 10186184c58..5a15066e31e 100644
--- a/sysutils/gkrellm/plugins/Makefile.inc
+++ b/sysutils/gkrellm/plugins/Makefile.inc
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile.inc,v 1.15 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile.inc,v 1.16 2007/10/25 07:30:24 ajacoutot Exp $
 
-MAINTAINER?=		Peter Hessler <spambox@theapt.org>
+MAINTAINER?=	Antoine Jacoutot <ajacoutot@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM?=	Yes
diff --git a/sysutils/gkrellm/plugins/aclock/Makefile b/sysutils/gkrellm/plugins/aclock/Makefile
index 114f2b6109b..4f5e4432b16 100644
--- a/sysutils/gkrellm/plugins/aclock/Makefile
+++ b/sysutils/gkrellm/plugins/aclock/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.12 2007/10/25 07:30:24 ajacoutot Exp $
 
 COMMENT=	Analog clock for GkrellM2
 
 VERSION=	0.3.3
 DISTNAME=	gkrellaclock-${VERSION}
-PKGNAME=	${DISTNAME}p5
+PKGNAME=	${DISTNAME}p6
 CATEGORIES=	misc sysutils/gkrellm
 
 HOMEPAGE=	http://www.geocities.com/m_muthukumar/gkrellaclock.html
diff --git a/sysutils/gkrellm/plugins/bgchg/Makefile b/sysutils/gkrellm/plugins/bgchg/Makefile
index a0d6bd8057f..f7ec948adfe 100644
--- a/sysutils/gkrellm/plugins/bgchg/Makefile
+++ b/sysutils/gkrellm/plugins/bgchg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.16 2007/10/25 07:30:24 ajacoutot Exp $
 
 COMMENT=	Change Background Image with GkrellM2
 
 DISTNAME=	gkrellmbgchg2-0.1.3
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	x11 sysutils/gkrellm
 
 HOMEPAGE=	http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html
diff --git a/sysutils/gkrellm/plugins/flynn/Makefile b/sysutils/gkrellm/plugins/flynn/Makefile
index ad4bacf8a4b..aac15e6ede7 100644
--- a/sysutils/gkrellm/plugins/flynn/Makefile
+++ b/sysutils/gkrellm/plugins/flynn/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.8 2007/10/25 07:30:24 ajacoutot Exp $
 
 COMMENT=	GkrellM2 load meter with a familiar face
 
 DISTNAME=	gkrellflynn-0.8
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	x11 sysutils/gkrellm
 
 HOMEPAGE=	http://horus.comlab.uni-rostock.de/flynn/
diff --git a/sysutils/gkrellm/plugins/itime/Makefile b/sysutils/gkrellm/plugins/itime/Makefile
index 4561bcffd32..1963a7f06b9 100644
--- a/sysutils/gkrellm/plugins/itime/Makefile
+++ b/sysutils/gkrellm/plugins/itime/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.11 2007/10/25 07:30:24 ajacoutot Exp $
 
 COMMENT=	GkrellM2 plugin that shows Interet Time
 
 VERSION=	1.0.1
 DISTNAME=	gkrellmitime-${VERSION}
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	net sysutils/gkrellm
 
 HOMEPAGE=	http://eric.bianchi.free.fr/gkrellm/
diff --git a/sysutils/gkrellm/plugins/kam/Makefile b/sysutils/gkrellm/plugins/kam/Makefile
index a09b1a4ff59..70ecc180541 100644
--- a/sysutils/gkrellm/plugins/kam/Makefile
+++ b/sysutils/gkrellm/plugins/kam/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.7 2007/10/25 07:30:24 ajacoutot Exp $
 
 COMMENT=	Web cam plugin for GkrellM2
 
 VERSION=	2.0.0
 DISTNAME=	gkrellkam-${VERSION}
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	graphics sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellkam.sourceforge.net
diff --git a/sysutils/gkrellm/plugins/launch/Makefile b/sysutils/gkrellm/plugins/launch/Makefile
index 4df9c78fd44..e1c2f6ea8e6 100644
--- a/sysutils/gkrellm/plugins/launch/Makefile
+++ b/sysutils/gkrellm/plugins/launch/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.10 2007/10/25 07:30:24 ajacoutot Exp $
 
 COMMENT=	launch commonly used apps from GkrellM2
 
 DISTNAME=	gkrellmlaunch-0.5
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	x11 sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellmlaunch.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/mailwatch/Makefile b/sysutils/gkrellm/plugins/mailwatch/Makefile
index bb8108379ad..2baa94b412d 100644
--- a/sysutils/gkrellm/plugins/mailwatch/Makefile
+++ b/sysutils/gkrellm/plugins/mailwatch/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.12 2007/10/25 07:30:24 ajacoutot Exp $
 
 COMMENT=	GkrellM2 plugin to monitor multiple mailboxes
 
 DISTNAME=	gkrellm-mailwatch-2.4.3
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	mail sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellm.luon.net/mailwatch.phtml
diff --git a/sysutils/gkrellm/plugins/mms/Makefile b/sysutils/gkrellm/plugins/mms/Makefile
index 06d1592a25d..51e13dfb9a2 100644
--- a/sysutils/gkrellm/plugins/mms/Makefile
+++ b/sysutils/gkrellm/plugins/mms/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.15 2007/10/25 07:30:24 ajacoutot Exp $
 
 COMMENT=	XMMS plugin for Gkrellm2
 
 DISTNAME=	gkrellmms-2.1.21
-PKGNAME=	${DISTNAME}p5
+PKGNAME=	${DISTNAME}p6
 CATEGORIES=	audio sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmms.phtml
diff --git a/sysutils/gkrellm/plugins/moon/Makefile b/sysutils/gkrellm/plugins/moon/Makefile
index 8867eb89b97..233c078c4f4 100644
--- a/sysutils/gkrellm/plugins/moon/Makefile
+++ b/sysutils/gkrellm/plugins/moon/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.10 2007/10/25 07:30:24 ajacoutot Exp $
 
 COMMENT=	Phase of the Moon for GkrellM2
 
 DISTNAME=	gkrellmoon-0.6
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	astro sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellmoon.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/mss/Makefile b/sysutils/gkrellm/plugins/mss/Makefile
index 3275ca68c6c..d8e43cd190b 100644
--- a/sysutils/gkrellm/plugins/mss/Makefile
+++ b/sysutils/gkrellm/plugins/mss/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.17 2007/10/25 07:30:24 ajacoutot Exp $
 
 COMMENT=	Soundscope for GkrellM2 using ESD
 
 DISTNAME=	gkrellmss-2.6
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	audio sysutils/gkrellm
 
 HOMEPAGE=http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html
diff --git a/sysutils/gkrellm/plugins/reminder/Makefile b/sysutils/gkrellm/plugins/reminder/Makefile
index 3496f59b116..4eca71a49ae 100644
--- a/sysutils/gkrellm/plugins/reminder/Makefile
+++ b/sysutils/gkrellm/plugins/reminder/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.11 2007/10/25 07:30:24 ajacoutot Exp $
 
 COMMENT=	GKrellM2 will remind you to do important events
 
 DISTNAME=	gkrellm-reminder-2.0.0
-PKGNAME=	${DISTNAME}p7
+PKGNAME=	${DISTNAME}p8
 CATEGORIES=	misc sysutils/gkrellm
 
 HOMEPAGE=	http://members.dslextreme.com/users/billw/gkrellm/Plugins.html\#REMINDER
diff --git a/sysutils/gkrellm/plugins/shoot/Makefile b/sysutils/gkrellm/plugins/shoot/Makefile
index cd5c7f95176..d2364ac4057 100644
--- a/sysutils/gkrellm/plugins/shoot/Makefile
+++ b/sysutils/gkrellm/plugins/shoot/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.10 2007/10/25 07:30:25 ajacoutot Exp $
 
 COMMENT=	Snapshot and background plugin for Gkrellm2
 
 VERSION=	0.4.3
 DISTNAME=	gkrellshoot-${VERSION}
-PKGNAME=	${DISTNAME}p5
+PKGNAME=	${DISTNAME}p8
 CATEGORIES=	x11 sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellshoot.sourceforge.net
diff --git a/sysutils/gkrellm/plugins/stock/Makefile b/sysutils/gkrellm/plugins/stock/Makefile
index 0e6b9af0e72..f2e334fd563 100644
--- a/sysutils/gkrellm/plugins/stock/Makefile
+++ b/sysutils/gkrellm/plugins/stock/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.10 2007/10/25 07:30:25 ajacoutot Exp $
 
 COMMENT=	Stock Ticker for GkrellM2
 
 VERSION=	0.5.1
 DISTNAME=	gkrellstock-${VERSION}
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	misc sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellstock.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/sun/Makefile b/sysutils/gkrellm/plugins/sun/Makefile
index 82470cf26d5..4c222547347 100644
--- a/sysutils/gkrellm/plugins/sun/Makefile
+++ b/sysutils/gkrellm/plugins/sun/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.12 2007/10/25 07:30:25 ajacoutot Exp $
 
 COMMENT=	GkrellM2 plugin to display sun rise/set times
 
 DISTNAME=	gkrellsun-0.12.1
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	astro sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellsun.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/volume/Makefile b/sysutils/gkrellm/plugins/volume/Makefile
index a6989abc5ab..a53f2b9670c 100644
--- a/sysutils/gkrellm/plugins/volume/Makefile
+++ b/sysutils/gkrellm/plugins/volume/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.12 2007/10/25 07:30:25 ajacoutot Exp $
 
 COMMENT=	Volume dial for Gkrellm2
 
 DISTNAME=	gkrellm-volume-2.1.13
-PKGNAME=	${DISTNAME}p5
+PKGNAME=	${DISTNAME}p6
 CATEGORIES=	audio sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellm.luon.net/volume.phtml
diff --git a/sysutils/gkrellm/plugins/weather/Makefile b/sysutils/gkrellm/plugins/weather/Makefile
index daf196962ce..04e6e2f841a 100644
--- a/sysutils/gkrellm/plugins/weather/Makefile
+++ b/sysutils/gkrellm/plugins/weather/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.12 2007/10/25 07:30:25 ajacoutot Exp $
 
 COMMENT=	Weather plugin for GkrellM2
 
 DISTNAME=	gkrellweather-2.0.6
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	x11 sysutils/gkrellm
 EXTRACT_SUFX=	.tgz
 
diff --git a/sysutils/gkrellm/plugins/wireless/Makefile b/sysutils/gkrellm/plugins/wireless/Makefile
index 7e1bae2980b..202b8018324 100644
--- a/sysutils/gkrellm/plugins/wireless/Makefile
+++ b/sysutils/gkrellm/plugins/wireless/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2007/09/23 12:57:08 sturm Exp $
+# $OpenBSD: Makefile,v 1.11 2007/10/25 07:30:25 ajacoutot Exp $
 
 COMMENT=	GkrellM2 plugin to monitor wireless strength
 
 VERSION=	2.0.3
 DISTNAME=	gkrellmwireless-${VERSION}
-PKGNAME=	gkrellm-wireless-${VERSION}p6
+PKGNAME=	gkrellm-wireless-${VERSION}p7
 CATEGORIES=	net sysutils/gkrellm
 
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmwireless.phtml