diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile
index 91283a11d82..e3a4dc08c9c 100644
--- a/net/honeyd/Makefile
+++ b/net/honeyd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2009/03/26 11:50:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.23 2010/04/21 23:42:18 alek Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	utility to create virtual hosts on a network
 DISTNAME=	honeyd-1.5c
-PKGNAME=	${DISTNAME}p3
+PKGNAME=	${DISTNAME}p4
 CATEGORIES=	net
 MASTER_SITES=	http://www.citi.umich.edu/u/provos/honeyd/ \
 		http://niels.xtdnet.nl/honeyd/
@@ -29,11 +29,13 @@ USE_LIBTOOL=	Yes
 MODULES=	lang/python
 LIB_DEPENDS=	dnet.>=1::net/libdnet \
 		${MODPY_LIB_DEPENDS} \
-		pcre.>=1::devel/pcre
+		pcre.>=1::devel/pcre \
+		eventextra.>=1::devel/libeventextra
 RUN_DEPENDS=	::net/rrdtool
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	PATH_PYTHON=${MODPY_BIN}
+CONFIGURE_ENV=	PATH_PYTHON=${MODPY_BIN} \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS= --with-python
 
 SCRIPTS=	INSTALL.kuang2 README.cmdexe README.kuang2 	\
diff --git a/net/honeyd/patches/patch-configure b/net/honeyd/patches/patch-configure
new file mode 100644
index 00000000000..3c74d4d1c3f
--- /dev/null
+++ b/net/honeyd/patches/patch-configure
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.3 2010/04/21 23:42:18 alek Exp $
+--- configure.orig	Thu Apr 22 01:16:08 2010
++++ configure	Thu Apr 22 01:16:23 2010
+@@ -21561,7 +21561,7 @@ else
+      EVENTINC="-I/usr/include/event"
+      EVENTLIB="-levent"
+   elif test -f /usr/include/event.h; then
+-     EVENTLIB="-levent"
++     EVENTLIB="-levent -leventextra"
+   else
+      { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
diff --git a/net/honeyd/pkg/PLIST b/net/honeyd/pkg/PLIST
index 394fc59cb50..44ae4e01d0f 100644
--- a/net/honeyd/pkg/PLIST
+++ b/net/honeyd/pkg/PLIST
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.8 2007/07/25 22:27:01 rui Exp $
+@comment $OpenBSD: PLIST,v 1.9 2010/04/21 23:42:18 alek Exp $
 @newgroup _honeyd:!546
 @newuser _honeyd:!546:!_honeyd:daemon:honeyd user:/nonexistent:/sbin/nologin
-bin/honeyd
-bin/honeydctl
-bin/honeydstats
-bin/hsniff
+@bin bin/honeyd
+@bin bin/honeydctl
+@bin bin/honeydstats
+@bin bin/hsniff
 include/honeyd/
 include/honeyd/debug.h
 include/honeyd/hooks.h
@@ -22,7 +22,7 @@ share/honeyd/config.sample
 share/honeyd/nmap.assoc
 share/honeyd/nmap.prints
 share/honeyd/pf.os
-share/honeyd/proxy
+@bin share/honeyd/proxy
 share/honeyd/scripts/
 share/honeyd/scripts/INSTALL.kuang2
 share/honeyd/scripts/README.cmdexe
@@ -44,7 +44,7 @@ share/honeyd/scripts/snmp/linux-2.4.snmp.tpl
 share/honeyd/scripts/snmp/windows2000.snmp.tpl
 share/honeyd/scripts/test.sh
 share/honeyd/scripts/web.sh
-share/honeyd/smtp
+@bin share/honeyd/smtp
 share/honeyd/webserver/
 @owner _honeyd
 @group _honeyd