diff --git a/net/hping/Makefile b/net/hping/Makefile
index 6af40bde659..90e40452ab0 100644
--- a/net/hping/Makefile
+++ b/net/hping/Makefile
@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.22 2006/05/31 00:08:20 aanriot Exp $
+# $OpenBSD: Makefile,v 1.23 2007/04/03 13:55:22 aanriot Exp $
 
 COMMENT=	"TCP/UDP ping/traceroute tool"
 
 DISTNAME=	hping2.0.0-rc3
-PKGNAME=	hping-2.0.0rc3p0
+PKGNAME=	hping-2.0.0rc3p1
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.hping.org/
 
-MAINTAINER=	Alexandre Anriot <aanriot@openbsd.org>
-
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/security/nessus/Makefile.inc b/security/nessus/Makefile.inc
index 4101e7f7ce0..b18485c3c68 100644
--- a/security/nessus/Makefile.inc
+++ b/security/nessus/Makefile.inc
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.8 2007/02/13 11:55:01 aanriot Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2007/04/03 13:55:59 aanriot Exp $
 
 V=		2.2.9
 CATEGORIES=	security
 
 HOMEPAGE=	http://www.nessus.org/
 
-MAINTAINER=	Alexandre Anriot <aanriot@openbsd.org>
-
 # GPL
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
diff --git a/security/nessus/core/Makefile b/security/nessus/core/Makefile
index 6503c7c6ff3..24cf46342e6 100644
--- a/security/nessus/core/Makefile
+++ b/security/nessus/core/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2007/03/21 21:29:32 aanriot Exp $
+# $OpenBSD: Makefile,v 1.16 2007/04/03 13:55:59 aanriot Exp $
 
 COMMENT=	"network security scanner"
 DISTNAME=	nessus-core-${V}
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 
 FLAVORS=	no_x11
 FLAVOR?=
diff --git a/security/nessus/libnasl/Makefile b/security/nessus/libnasl/Makefile
index f4bb9c375f3..1bf519b9515 100644
--- a/security/nessus/libnasl/Makefile
+++ b/security/nessus/libnasl/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2006/09/23 08:45:04 aanriot Exp $
+# $OpenBSD: Makefile,v 1.11 2007/04/03 13:55:59 aanriot Exp $
 
 COMMENT=	"Nessus Attack Scripting Language"
 DISTNAME=	libnasl-${V}
+PKGNAME=	${DISTNAME}p0
 
 SHARED_LIBS=	nasl	4.7
 
diff --git a/security/nessus/libraries/Makefile b/security/nessus/libraries/Makefile
index 32a64d80b7d..7c8569f1367 100644
--- a/security/nessus/libraries/Makefile
+++ b/security/nessus/libraries/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2006/09/23 08:45:04 aanriot Exp $
+# $OpenBSD: Makefile,v 1.6 2007/04/03 13:55:59 aanriot Exp $
 
 COMMENT=	"libraries for Nessus"
 DISTNAME=	nessus-libraries-${V}
+PKGNAME=	${DISTNAME}p0
 
 SHARED_LIBS=	hosts_gatherer	4.7 \
 		nessus		4.7
diff --git a/security/nessus/plugins/Makefile b/security/nessus/plugins/Makefile
index dab00df0801..1b4028703a6 100644
--- a/security/nessus/plugins/Makefile
+++ b/security/nessus/plugins/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2006/06/01 05:16:32 aanriot Exp $
+# $OpenBSD: Makefile,v 1.7 2007/04/03 13:55:59 aanriot Exp $
 
 COMMENT=	"plugins for Nessus"
 DISTNAME=	nessus-plugins-GPL-${V}
-PKGNAME=	${DISTNAME:S/-GPL//}
+PKGNAME=	${DISTNAME:S/-GPL//}p0
 
 WANTLIB=	crypto hosts_gatherer m nessus pcap ssl util