diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile
index f76ca958aab..b3f6d08c365 100644
--- a/net/honeyd/Makefile
+++ b/net/honeyd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2005/10/23 08:16:18 aanriot Exp $
+# $OpenBSD: Makefile,v 1.12 2005/11/16 23:23:34 naddy Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 COMMENT=	"utility to create virtual hosts on a network"
 DISTNAME=	honeyd-1.0
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	net
 MASTER_SITES=	http://www.citi.umich.edu/u/provos/honeyd/ \
 		http://niels.xtdnet.nl/honeyd/
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c edit m ncurses pcap pthread util z
+WANTLIB=		c edit event m ncurses pcap pthread util z
 
 USE_LIBTOOL=	Yes
 
diff --git a/net/nylon/Makefile b/net/nylon/Makefile
index 0ee214fa43a..b7dbf59594b 100644
--- a/net/nylon/Makefile
+++ b/net/nylon/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2004/12/16 00:31:24 alek Exp $
+# $OpenBSD: Makefile,v 1.3 2005/11/16 23:23:34 naddy Exp $
 
 COMMENT=	"lightweight SOCKS 4 and SOCKS 5 proxy"
 DISTNAME=	nylon-1.2
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net
 
 HOMEPAGE=	http://monkey.org/~marius/nylon/
@@ -13,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c
+WANTLIB=		c event
 
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 52878e8748d..736807da373 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2005/09/30 09:18:10 alek Exp $
+# $OpenBSD: Makefile,v 1.17 2005/11/16 23:23:34 naddy Exp $
 
 COMMENT=	"anonymity service using onion routing"
 
 DISTNAME=	tor-0.1.0.15
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net
 HOMEPAGE=	http://tor.eff.org/
 
@@ -13,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c crypto ssl z
+WANTLIB=		c crypto event ssl z
 
 MASTER_SITES=	${HOMEPAGE}dist/
 
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index 2bf1203e378..27482e107a3 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2005/03/09 03:09:10 jolan Exp $
+# $OpenBSD: Makefile,v 1.10 2005/11/16 23:23:34 naddy Exp $
 
 COMMENT=	"lightweight userspace bandwidth shaper"
 DISTNAME=	trickle-1.06
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	net
 HOMEPAGE=	"http://monkey.org/~marius/pages/?page=trickle"
 MASTER_SITES=	http://monkey.org/~marius/trickle/
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c 
+WANTLIB=		c event
 
 CONFIGURE_STYLE=gnu
 
diff --git a/security/scanssh/Makefile b/security/scanssh/Makefile
index 50a86285106..dbe13fa1d83 100644
--- a/security/scanssh/Makefile
+++ b/security/scanssh/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2005/09/06 05:05:07 aanriot Exp $
+# $OpenBSD: Makefile,v 1.14 2005/11/16 23:23:34 naddy Exp $
 
 COMMENT=	"SSH remote version scanner"
 
 DISTNAME=	scanssh-2.1
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	security
 MASTER_SITES=	http://monkey.org/~provos/ \
 		ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/scanssh/
@@ -15,7 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c pcap
+WANTLIB=		c event pcap
 
 LIB_DEPENDS=	dnet.1::net/libdnet
 
diff --git a/security/stegdetect/Makefile b/security/stegdetect/Makefile
index 507ac0b8fce..94e16f8feeb 100644
--- a/security/stegdetect/Makefile
+++ b/security/stegdetect/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2004/12/27 13:28:35 alek Exp $
+# $OpenBSD: Makefile,v 1.4 2005/11/16 23:23:34 naddy Exp $
 
 COMMENT=	"steganography detection tool"
 DISTNAME=	stegdetect-0.5
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	security graphics
 MASTER_SITES=	${HOMEPAGE}
 
@@ -12,7 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xi c crypto gmodule iconv intl m
+WANTLIB=		X11 Xext Xi c crypto event gmodule iconv intl m
 
 LIB_DEPENDS=	gdk.1.2,gtk.1.2,glib.1.2::x11/gtk+
 
diff --git a/security/vomit/Makefile b/security/vomit/Makefile
index af901cc3886..f94076dbc91 100644
--- a/security/vomit/Makefile
+++ b/security/vomit/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2005/05/24 00:23:35 mjc Exp $
+# $OpenBSD: Makefile,v 1.11 2005/11/16 23:23:34 naddy Exp $
 
 COMMENT=		"voice over misconfigured internet telephones"
 
 DISTNAME=		vomit-0.2
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 
 CATEGORIES=		security
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes 
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c pcap
+WANTLIB=		c event pcap
 
 WRKDIST=		${WRKDIR}/vomit-lite