diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index 4436f7397da..4fd16989cad 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2006/07/01 06:31:01 aanriot Exp $
+# $OpenBSD: Makefile,v 1.6 2006/07/31 13:02:18 aanriot Exp $
 SHARED_ONLY=	Yes
 
 COMMENT=	"determine the malware activity on a network"
 
 DISTNAME= 	nepenthes-0.1.7
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	net
 
 HOMEPAGE=	http://nepenthes.mwcollect.org/
@@ -42,10 +42,10 @@ CONFIGURE_ARGS+=--disable-geolocation-ip2location \
 		--localstatedir='/var/nepenthes' \
 		--with-curl-lib=${PREFIX}/lib
 
-pre-install:
-	@perl -pi -e 's:\"var:\"\/var\/nepenthes:g' \
+pre-configure:
+	@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \
 		${WRKBUILD}/conf/nepenthes.conf.dist
-	@perl -pi -e 's:\"etc:\"${SYSCONFDIR}:g' \
+	@perl -pi -e "s,%%PREFIX%%,${PREFIX}," \
 		${WRKBUILD}/conf/nepenthes.conf.dist
 	@perl -pi -e 's:\"var\/log:\"\/var\/nepenthes\/log:g' \
 		${WRKBUILD}/modules/log-download/log-download.conf.dist
diff --git a/net/nepenthes/patches/patch-conf_nepenthes_conf_dist b/net/nepenthes/patches/patch-conf_nepenthes_conf_dist
new file mode 100644
index 00000000000..1aaad5ffa26
--- /dev/null
+++ b/net/nepenthes/patches/patch-conf_nepenthes_conf_dist
@@ -0,0 +1,48 @@
+$OpenBSD: patch-conf_nepenthes_conf_dist,v 1.1 2006/07/31 13:02:18 aanriot Exp $
+--- conf/nepenthes.conf.dist.orig	Sun Jul 30 11:59:05 2006
++++ conf/nepenthes.conf.dist	Sun Jul 30 12:04:09 2006
+@@ -3,8 +3,8 @@
+ 
+ nepenthes
+ {
+-    moduledir               "lib/nepenthes";        // relative to workdir
+-    moduleconfigdir         "etc/nepenthes";                  // relative to workdir
++    moduledir               "%%PREFIX%%/lib/nepenthes";
++    moduleconfigdir         "%%SYSCONFDIR%%/nepenthes";
+ 
+     modules(
+ //  module name (in moduledir)      config file (in moduleconfigdir)
+@@ -91,8 +91,8 @@ nepenthes
+ 
+     logmanager
+     {
+-	ring_logging_file		"var/log/nepenthes.%d.log";
+-	file_logging_file		"var/log/nepenthes.log";
++	ring_logging_file		"/var/nepenthes/log/nepenthes.%d.log";
++	file_logging_file		"/var/nepenthes/log/nepenthes.log";
+     };
+ 
+     modulemanager
+@@ -104,7 +104,7 @@ nepenthes
+     {
+         strictfiletype              "1";
+         // where does submit-file write to? set this to the same dir
+-        filesdir                    "var/binaries/"; 
++        filesdir                    "/var/nepenthes/binaries/"; 
+     };
+ 
+     downloadmanager
+@@ -123,11 +123,11 @@ nepenthes
+     
+     utilities
+     {
+-	hexdump_path                "var/hexdumps/";
++	hexdump_path                "/var/nepenthes/hexdumps/";
+     };
+     
+     geolocationmanager
+     {
+-	cache_path                   "var/cache/nepenthes/geolocation/";
++	cache_path                   "/var/nepenthes/cache/nepenthes/geolocation/";
+     };
+ };