diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index d1c5aa6a341..297380f5bb6 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2004/06/19 21:37:38 jakob Exp $
+# $OpenBSD: Makefile,v 1.18 2004/10/08 10:04:26 espie Exp $
 
 COMMENT=	"monitor arp & rarp requests"
 
@@ -31,6 +31,7 @@ do-install:
 	@for i in ethercodes.dat d.awk e.awk p.awk; do \
 		${INSTALL_DATA} ${WRKSRC}/$$i ${EXAMPLESDIR}; \
 	done
+	@${INSTALL_DATA} /dev/null ${EXAMPLESDIR}/arp.dat
 	@${INSTALL_SCRIPT} ${WRKSRC}/arp2ethers ${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/net/arpwatch/pkg/INSTALL b/net/arpwatch/pkg/INSTALL
deleted file mode 100644
index 1fed3bb7cc9..00000000000
--- a/net/arpwatch/pkg/INSTALL
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: INSTALL,v 1.1 2001/06/01 23:36:32 jakob Exp $
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=/var/arpwatch
-SAMPLE_CONFIG_DIR=$PREFIX/share/examples/arpwatch
-
-
-do_configs()
-{
-    if [ -d $CONFIG_DIR ]; then
-	echo ""
-	echo "+---------------"
-	echo "| The existing $1 configuration files in $CONFIG_DIR,"
-	echo "| have NOT been changed.  You may want to compare them to the"
-	echo "| current sample files, $SAMPLE_CONFIG_DIR,"
-	echo "| and update your configuration as needed."
-    	echo "+---------------"
-	echo ""
-    else
-	install -d -o root -g wheel -m 755 $CONFIG_DIR
-	install -o root -g wheel -m 444 \
-	    $SAMPLE_CONFIG_DIR/ethercodes.dat $CONFIG_DIR
-	install -o root -g wheel -m 644 \
-	    /dev/null $CONFIG_DIR/arp.dat
-
-	echo ""
-	echo "+---------------"
-	echo "| The $1 configuration files in $CONFIG_DIR,"
-	echo "| have been installed.  Please view these files and change"
-	echo "| the configuration to meet your needs."
-	echo "+---------------"
-	echo ""
-    fi
-}
-
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-case $2 in
-    PRE-INSTALL)
-	;;
-    POST-INSTALL)
-	do_configs $1
-	;;
-    *)
-	echo "Usage: `basename $0` distname <PRE-INSTALL|POST-INSTALL>" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/net/arpwatch/pkg/PLIST b/net/arpwatch/pkg/PLIST
index fa26d6ff0b3..197b48be7b5 100644
--- a/net/arpwatch/pkg/PLIST
+++ b/net/arpwatch/pkg/PLIST
@@ -1,11 +1,19 @@
-@comment $OpenBSD: PLIST,v 1.7 2004/09/15 18:17:38 espie Exp $
+@comment $OpenBSD: PLIST,v 1.8 2004/10/08 10:04:26 espie Exp $
 @man man/man8/arpsnmp.8
 @man man/man8/arpwatch.8
 sbin/arpsnmp
 sbin/arpwatch
+@sample /var/arpwatch/
 share/examples/arpwatch/
 share/examples/arpwatch/arp2ethers
 share/examples/arpwatch/d.awk
 share/examples/arpwatch/e.awk
 share/examples/arpwatch/ethercodes.dat
+@mode 444
+@sample /var/arpwatch/ethercodes.dat
+@mode
 share/examples/arpwatch/p.awk
+share/examples/arpwatch/arp.dat
+@mode 644
+@sample /var/arpwatch/arp.dat
+@mode