diff --git a/databases/gnats/pkg/DEINSTALL b/databases/gnats/pkg/DEINSTALL
deleted file mode 100644
index d2f6d481467..00000000000
--- a/databases/gnats/pkg/DEINSTALL
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.6 2004/08/08 16:24:28 espie Exp $
-#
-# De-installation setup of gnats
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-do_notice()
-{
-    echo ""
-    echo "+---------------"
-    echo "| To completely deinstall the $1 package you need to perform"
-    echo "| these steps as root:"
-    echo "|"
-    echo "|       crontab -u _gnats -r"
-    echo "|       userdel _gnats"
-    echo "|"
-    echo "| Do not do this if you plan on re-installing $1"
-    echo "| at some future time."
-    echo "+---------------"
-    echo ""
-}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { DEINSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    DEINSTALL)
-	if [ ${PKG_DELETE_EXTRA} != Yes ]; then
-		do_notice "$1"
-	fi
-	;;
-    *)
-	echo "Usage: `basename $0` distname DEINSTALL" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/databases/gnats/pkg/INSTALL b/databases/gnats/pkg/INSTALL
deleted file mode 100644
index 9a5362d21e5..00000000000
--- a/databases/gnats/pkg/INSTALL
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.6 2004/08/08 16:24:28 espie Exp $
-#
-# Pre/post-installation setup of gnats
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-USER=_gnats
-ID=501
-
-do_accts()
-{
-    userinfo -e $USER
-    if [ $? -eq 0 ]; then
-	echo "===>  Using account '$USER' for gnats"
-    else
-	echo "===>  Creating gnats user"
-	useradd \
-	    -g daemon \
-	    -c "GNATS database owner" \
-	    -d $PREFIX/share/gnats \
-	    -s /sbin/nologin \
-	    -u $ID $USER
-    fi
-}
-
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-case $2 in
-    PRE-INSTALL)
-	do_accts
-	;;
-    POST-INSTALL)
-	echo "===>  See ${PREFIX}/share/doc/gnats/README.OpenBSD for further configuration"
-	;;
-    *)
-	echo "Usage: `basename $0` distname <PRE-INSTALL|POST-INSTALL>" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/databases/gnats/pkg/PLIST b/databases/gnats/pkg/PLIST
index 4611d9b2d1f..2ba66c3d11e 100644
--- a/databases/gnats/pkg/PLIST
+++ b/databases/gnats/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.7 2004/08/08 16:24:28 espie Exp $
+@comment $OpenBSD: PLIST,v 1.8 2004/09/24 08:56:49 espie Exp $
+@newuser _gnats:501:daemon::GNATS database owner:${PREFIX}/share/gnats:/sbin/nologin
 bin/edit-pr
 bin/getclose
 bin/install-sid
@@ -15,7 +16,6 @@ libexec/gnats/at-pr
 libexec/gnats/check-db
 libexec/gnats/delete-pr
 libexec/gnats/file-pr
-libexec/gnats/gen-index
 libexec/gnats/gnats-edit-pr
 libexec/gnats/gnatsd
 libexec/gnats/mail-query
@@ -25,12 +25,8 @@ libexec/gnats/npr-addr
 libexec/gnats/npr-edit
 libexec/gnats/pr-addr
 libexec/gnats/pr-age
-libexec/gnats/pr-edit
 libexec/gnats/pr-mail
-libexec/gnats/queue-pr
 libexec/gnats/rmcat
-@exec chown _gnats %D/libexec/gnats/gen-index %D/libexec/gnats/pr-edit %D/libexec/gnats/queue-pr
-@exec chmod 4555 %D/libexec/gnats/gen-index %D/libexec/gnats/pr-edit %D/libexec/gnats/queue-pr
 @man man/man1/edit-pr.1
 @man man/man1/query-pr.1
 @man man/man1/send-pr.1
@@ -46,6 +42,12 @@ share/doc/gnats/README.OpenBSD
 share/examples/gnats/
 share/examples/gnats/gnats-db.conf
 @sample ${SYSCONFDIR}/gnats-db.conf
+@owner _gnats
+@mode 4555
+libexec/gnats/gen-index
+libexec/gnats/pr-edit
+libexec/gnats/queue-pr
+@mode
 share/gnats/
 share/gnats/cygnus
 share/gnats/dist/
@@ -76,9 +78,7 @@ share/gnats/gnats-db/gnats-adm/locks/
 share/gnats/gnats-db/gnats-adm/responsible
 share/gnats/gnats-db/gnats-adm/states
 share/gnats/gnats-db/gnats-adm/submitters
-@exec chown -R _gnats %D/share/gnats
 share/gnats/gnats-db/gnats-queue/
 share/gnats/gnats-db/pending/
 %%www%%
 @extraunexec crontab -u _gnats -r > /dev/null 2>&1
-@extraunexec userdel _gnats