diff --git a/graphics/dvdrip/Makefile b/graphics/dvdrip/Makefile
index f2895a20787..9e8cd8b66b1 100644
--- a/graphics/dvdrip/Makefile
+++ b/graphics/dvdrip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2005/11/27 10:54:10 sturm Exp $
+# $OpenBSD: Makefile,v 1.7 2006/01/22 18:40:36 jolan Exp $
 
 COMMENT=	"full featured DVD copy program"
 
@@ -9,7 +9,7 @@ CATEGORIES=	graphics audio perl5
 
 HOMEPAGE=	http://www.exit1.org/dvdrip/
 
-MAINTAINER=	Waldemar Brodkorb <wbx@openbsd.de>
+MAINTAINER=	Jacob Meuser <jakemsr@openbsd.org>
 
 # Artistic and GPL
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/net/pptp/Makefile b/net/pptp/Makefile
index d3d57cb2eeb..940e6ffa224 100644
--- a/net/pptp/Makefile
+++ b/net/pptp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2005/10/01 07:40:33 alek Exp $
+# $OpenBSD: Makefile,v 1.12 2006/01/22 18:40:36 jolan Exp $
 # $NetBSD: Makefile,v 1.1.1.1 2000/04/10 01:14:01 jtk Exp $
 
 COMMENT=	'PPTP client package for Microsoft VPN servers'
@@ -10,7 +10,7 @@ MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE:=pptpclient/}
 
 HOMEPAGE=	http://pptpclient.sf.net
 
-MAINTAINER=	Waldemar Brodkorb <wbx@openbsd.de>
+MAINTAINER=	Benoit LECOCQ <blq@arcane-labs.net>
 
 # GPL
 PERMIT_PACKAGE_CDROM=   Yes
diff --git a/net/sixxs-heartbeatd/Makefile b/net/sixxs-heartbeatd/Makefile
index 8cf604f87fe..10240eefb7f 100644
--- a/net/sixxs-heartbeatd/Makefile
+++ b/net/sixxs-heartbeatd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2004/12/16 00:31:25 alek Exp $
+# $OpenBSD: Makefile,v 1.4 2006/01/22 18:40:36 jolan Exp $
 
 COMMENT=	"SixXS IPv6 tunnel broker heartbeat client"
 
@@ -9,8 +9,6 @@ CATEGORIES=	net
 HOMEPAGE=	http://www.sixxs.net/tools/heartbeat/
 MASTER_SITES=	http://www.sixxs.net/archive/sixxs/heartbeat/unix/
 
-MAINTAINER=	Waldemar Brodkorb <wbx@openbsd.de>
-
 # GPL
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes