diff --git a/games/bnetd/Makefile b/games/bnetd/Makefile
index c7c755f4c83..13a408d4188 100644
--- a/games/bnetd/Makefile
+++ b/games/bnetd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2000/03/24 22:11:41 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2000/04/05 14:35:49 kevlo Exp $
 
 DISTNAME=	bnetd-0.4.19
 CATEGORIES=	games 
@@ -8,13 +8,14 @@ MASTER_SITES=	http://www.bnetd.org/files/
 MAINTAINER=	kevlo@openbsd.org
 
 LICENSE_TYPE=		GPL
-PERMIT_PACKAGE_CDROM=	YES
-PERMIT_PACKAGE_FTP=	YES
-PERMIT_DISTFILES_CDROM=	YES
-PERMIT_DISTFILES_FTP=	YES
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
 
-HAS_CONFIGURE=Yes
-WRKSRC=	${WRKDIST}/src
+FAKE=			Yes		
+HAS_CONFIGURE=		Yes
+WRKSRC=			${WRKDIST}/src
 
 MAKE_FLAGS=CFLAGS=-O2
 
@@ -22,7 +23,6 @@ do-install:
 	cd ${WRKDIST}/bin; ${INSTALL_PROGRAM} * ${PREFIX}/bin
 	cd ${WRKDIST}/sbin; ${INSTALL_PROGRAM} * ${PREFIX}/sbin
 	cd ${WRKDIST}/man; ${INSTALL_MAN}  bnchat.1 bnetd.1 bnftp.1 bnpass.1 ${PREFIX}/man/man1; ${INSTALL_MAN} bnetd.conf.4 bntext.4 bnmotd.txt.4 bnnews.txt.4 ${PREFIX}/man/man4
-	${INSTALL_DATA_DIR} ${PREFIX}/bnetd && cd ${WRKDIST} && cp -R files users conf reports ${PREFIX}/bnetd
-
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/bnetd && cd ${WRKDIST} && cp -R files conf ${PREFIX}/lib/bnetd
 
 .include <bsd.port.mk>
diff --git a/games/bnetd/patches/patch-aa b/games/bnetd/patches/patch-aa
index 2fd9163da6f..89a0eca9591 100644
--- a/games/bnetd/patches/patch-aa
+++ b/games/bnetd/patches/patch-aa
@@ -1,11 +1,11 @@
---- src/configure.orig	Tue Nov  9 14:31:58 1999
-+++ src/configure	Tue Nov  9 14:32:21 1999
+--- src/configure.orig	Wed Aug 25 17:14:36 1999
++++ src/configure	Thu Apr  6 05:57:40 2000
 @@ -49,7 +49,7 @@
  sbindir='${exec_prefix}/sbin'
  libexecdir='${exec_prefix}/libexec'
  datadir='${prefix}/share'
 -sysconfdir='${prefix}/etc'
-+sysconfdir='${prefix}/bnetd/conf'
++sysconfdir='${prefix}/lib/bnetd/conf'
  sharedstatedir='${prefix}/com'
  localstatedir='${prefix}/var'
  libdir='${exec_prefix}/lib'
diff --git a/games/bnetd/patches/patch-ab b/games/bnetd/patches/patch-ab
index c81c44f0b11..8d07942f5ac 100644
--- a/games/bnetd/patches/patch-ab
+++ b/games/bnetd/patches/patch-ab
@@ -1,6 +1,6 @@
---- conf/bnetd.conf.orig	Tue Nov  9 10:07:56 1999
-+++ conf/bnetd.conf	Tue Nov  9 10:09:56 1999
-@@ -15,15 +15,15 @@
+--- conf/bnetd.conf.orig	Mon Oct 18 03:29:14 1999
++++ conf/bnetd.conf	Thu Apr  6 06:10:03 2000
+@@ -15,16 +15,16 @@
  # Use absolute paths in these lines to avoid problems!                       #
  #----------------------------------------------------------------------------#
  
@@ -13,15 +13,17 @@
 -newsfile    = /home/bnetd/conf/news.txt
 -adfile      = /home/bnetd/conf/ad.list
 -logfile     = /home/bnetd/bnetd.log
-+filedir     = /usr/local/bnetd/files/
-+userdir     = /usr/local/bnetd/users/
-+reportdir   = /usr/local/bnetd/reports/
-+defacct     = /usr/local/bnetd/conf/bnetd_default_user
-+motdfile    = /usr/local/bnetd/conf/bnmotd.txt
-+channelfile = /usr/local/bnetd/conf/channel.list
-+newsfile    = /usr/local/bnetd/conf/news.txt
-+adfile      = /user/local/bnetd/conf/ad.list
-+logfile     = /usr/local/bnetd/bnetd.log
- #pidfile     = /home/bnetd/bnetd.pid
+-#pidfile     = /home/bnetd/bnetd.pid
++filedir     = /usr/local/lib/bnetd/files/
++userdir     = /usr/local/lib/bnetd/users/
++reportdir   = /usr/local/lib/bnetd/reports/
++defacct     = /usr/local/lib/bnetd/conf/bnetd_default_user
++motdfile    = /usr/local/lib/bnetd/conf/bnmotd.txt
++channelfile = /usr/local/lib/bnetd/conf/channel.list
++newsfile    = /usr/local/lib/bnetd/conf/news.txt
++adfile      = /user/local/lib/bnetd/conf/ad.list
++#logfile     = /usr/local/lib/bnetd/bnetd.log    
++#pidfile     = /usr/local/lib/bnetd.pid
  
  #                                                                            #
+ ##############################################################################
diff --git a/games/bnetd/patches/patch-ac b/games/bnetd/patches/patch-ac
index 3fdd15ecff0..770fb27197d 100644
--- a/games/bnetd/patches/patch-ac
+++ b/games/bnetd/patches/patch-ac
@@ -1,11 +1,11 @@
---- include/setup.h.orig	Tue Nov  9 10:12:05 1999
-+++ include/setup.h	Tue Nov  9 10:12:43 1999
+--- include/setup.h.orig	Thu Oct  7 03:14:04 1999
++++ include/setup.h	Thu Apr  6 05:57:40 2000
 @@ -63,7 +63,7 @@
  #define FILE_TIME_MAXLEN 32
  
  #ifndef BNETD_DEFAULT_CONF_FILE
 -#define BNETD_DEFAULT_CONF_FILE "conf/bnetd.conf"
-+#define BNETD_DEFAULT_CONF_FILE "/usr/local/bnetd/bnetd.conf"
++#define BNETD_DEFAULT_CONF_FILE "/usr/local/lib/bnetd/conf/bnetd.conf"
  #endif
  #define BNETD_FILE_DIR          "files"
  #define BNETD_USER_DIR          "users"
diff --git a/games/bnetd/pkg/PLIST b/games/bnetd/pkg/PLIST
index 69de5345802..e59bcdc05d6 100644
--- a/games/bnetd/pkg/PLIST
+++ b/games/bnetd/pkg/PLIST
@@ -3,6 +3,15 @@ bin/bnchat
 bin/bnftp
 bin/bnpass
 bin/bnstat
+lib/bnetd/conf/ad.list
+lib/bnetd/conf/bnetd.conf
+lib/bnetd/conf/bnetd_default_user
+lib/bnetd/conf/bnmotd.txt
+lib/bnetd/conf/channel.list
+lib/bnetd/conf/news.txt
+lib/bnetd/files/ad000001.pcx
+lib/bnetd/files/icons.bni
+lib/bnetd/files/tos.txt
 sbin/bnetd
 sbin/bnproxy
 man/man1/bnchat.1
@@ -13,4 +22,6 @@ man/man4/bnetd.conf.4
 man/man4/bnmotd.txt.4
 man/man4/bnnews.txt.4
 man/man4/bntext.4
-@unexec rm -rf %D/bnetd 2>/dev/null || true
+@dirrm lib/bnetd/conf
+@dirrm lib/bnetd/files
+@dirrm lib/bnetd