diff --git a/security/aide/pkg/DEINSTALL b/security/aide/pkg/DEINSTALL
index 1cc810b77ac..6845476650d 100644
--- a/security/aide/pkg/DEINSTALL
+++ b/security/aide/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2002/12/08 23:40:20 lebel Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2004/04/14 09:27:52 xsa Exp $
 #
 # aide de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/aide.conf
 
-if [ -f $CONFIG_FILE ]; then
+if [ ${PKG_DELETE_EXTRA} != Yes -a -f $CONFIG_FILE ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/security/aide/pkg/PLIST b/security/aide/pkg/PLIST
index 2c0afaa0c24..4d34a2d34a5 100644
--- a/security/aide/pkg/PLIST
+++ b/security/aide/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/06/07 14:26:22 lebel Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/04/14 09:27:52 xsa Exp $
 bin/aide
 man/man1/aide.1
 man/man5/aide.conf.5
 share/examples/aide/aide.conf
 @dirrm share/examples/aide
+@cwd ${SYSCONFDIR}
+@extra aide.conf
diff --git a/security/cgichk/pkg/DEINSTALL b/security/cgichk/pkg/DEINSTALL
index 363bc5df936..f32626e163a 100644
--- a/security/cgichk/pkg/DEINSTALL
+++ b/security/cgichk/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2002/03/24 10:20:24 jsyn Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2004/04/14 09:27:52 xsa Exp $
 #
 # cgichk de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/cgichk.conf
 
-if [ -f ${CONFIG_FILE} ]; then
+if [ ${PKG_DELETE_EXTRA} != Yes -a -f ${CONFIG_FILE} ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/security/cgichk/pkg/PLIST b/security/cgichk/pkg/PLIST
index 33d23e40e2b..17abe92fff8 100644
--- a/security/cgichk/pkg/PLIST
+++ b/security/cgichk/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/03/24 10:20:24 jsyn Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/14 09:27:52 xsa Exp $
 bin/cgichk
 share/examples/cgichk/cgichk.conf
 @dirrm share/examples/cgichk
+@cwd ${SYSCONFDIR}
+@extra cgichk.conf
diff --git a/security/hlfl/pkg/DEINSTALL b/security/hlfl/pkg/DEINSTALL
index d170e3dd743..d597b5fe76f 100644
--- a/security/hlfl/pkg/DEINSTALL
+++ b/security/hlfl/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2001/07/05 20:10:38 jsyn Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2004/04/14 09:27:52 xsa Exp $
 #
 # hlfl de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/services.hlfl
 
-if [ -f "${CONFIG_FILE}" ]; then
+if [ ${PKG_DELETE_EXTRA} != Yes -a -f "${CONFIG_FILE}" ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/security/hlfl/pkg/PLIST b/security/hlfl/pkg/PLIST
index 22f1ad58687..201d8fb3e7c 100644
--- a/security/hlfl/pkg/PLIST
+++ b/security/hlfl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/07/05 20:10:38 jsyn Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/04/14 09:27:52 xsa Exp $
 bin/hlfl
 man/man1/hlfl.1
 share/examples/hlfl/sample_1.hlfl
@@ -7,3 +7,5 @@ share/examples/hlfl/services.hlfl
 share/examples/hlfl/syntax.txt
 share/examples/hlfl/test.hlfl
 @dirrm share/examples/hlfl
+@cwd ${SYSCONFDIR}
+@extra services.hlfl
diff --git a/security/integrit/pkg/DEINSTALL b/security/integrit/pkg/DEINSTALL
index 9a08f6c1790..f717f16b1c6 100644
--- a/security/integrit/pkg/DEINSTALL
+++ b/security/integrit/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/11/17 00:15:19 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2004/04/14 09:27:52 xsa Exp $
 #
 # integrit de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_DIR=${SYSCONFDIR}/integrit
 
-if [ -d $CONFIG_DIR ]; then 
+if [ ${PKG_DELETE_EXTRA} != Yes -a -d $CONFIG_DIR ]; then 
 	echo
 	echo "+------------"
 	echo "| To completely deinstall the $1 package you need to perform"
diff --git a/security/integrit/pkg/PLIST b/security/integrit/pkg/PLIST
index 2695dd0ad3c..dcf0ac0c2e1 100644
--- a/security/integrit/pkg/PLIST
+++ b/security/integrit/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/11/17 00:15:19 brad Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/04/14 09:27:52 xsa Exp $
 bin/i-ls
 @unexec install-info --delete --info-dir=%D/info %D/info/integrit.info
 info/integrit.info
@@ -18,3 +18,4 @@ share/examples/integrit/src.conf
 share/examples/integrit/usr.conf
 @dirrm share/examples/integrit
 @dirrm share/doc/integrit
+@extraunexec rm -rf ${SYSCONFDIR}/integrit
diff --git a/security/logsentry/pkg/DEINSTALL b/security/logsentry/pkg/DEINSTALL
index 027b2f5d9bc..793f1f78771 100644
--- a/security/logsentry/pkg/DEINSTALL
+++ b/security/logsentry/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2003/04/20 17:36:40 sturm Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2004/04/14 09:27:52 xsa Exp $
 #
 # logsentry de-installation
 
@@ -9,7 +9,7 @@ PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_DIR=${SYSCONFDIR}/logsentry
 TMP_DIR=/var/tmp/logsentry
 
-if [ -d $CONFIG_DIR ]; then
+if [ ${PKG_DELETE_EXTRA} != Yes -a -d $CONFIG_DIR ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/security/logsentry/pkg/PLIST b/security/logsentry/pkg/PLIST
index 2c1259b2523..ad012ba2ff3 100644
--- a/security/logsentry/pkg/PLIST
+++ b/security/logsentry/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/04/20 17:36:40 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/14 09:27:52 xsa Exp $
 @pkgcfl logcheck-1.1.1
 bin/logtail
 share/doc/logsentry/CREDITS
@@ -13,3 +13,5 @@ share/examples/logsentry/logsentry.violations
 share/examples/logsentry/logsentry.violations.ignore
 @dirrm share/examples/logsentry
 @dirrm share/doc/logsentry
+@extraunexec rm -rf ${SYSCONFDIR}/logsentry
+@extraunexec rm -rf /var/tmp/logsentry
diff --git a/security/p0f/pkg/DEINSTALL b/security/p0f/pkg/DEINSTALL
index b633fa32fb6..a358a824845 100644
--- a/security/p0f/pkg/DEINSTALL
+++ b/security/p0f/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2003/07/19 17:02:06 jose Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2004/04/14 09:27:52 xsa Exp $
 #
 # p0f de-installation, ganked from siphon de-installation
 
@@ -9,14 +9,14 @@ PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/p0f.fp
 MYSQL_CONFIG=${SYSCONFDIR}/p0f-mysql.conf
 
-if [ -f $CONFIG_FILE ]; then
+if [ ${PKG_DELETE_EXTRA} != Yes -a -f $CONFIG_FILE ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
     echo "| this step as root:"
     echo "|"
     echo "|           rm -f $CONFIG_FILE"
-    if [ -f $MYSQL_CONFIG ]; then
+    if [ ${PKG_DELETE_EXTRA} != Yes -a -f $MYSQL_CONFIG ]; then
 	echo "|           rm -f $MYSQL_CONFIG"
     fi
     echo "|"
diff --git a/security/p0f/pkg/PFRAG.mysql b/security/p0f/pkg/PFRAG.mysql
index d96bcdacc6f..f3b0c003adc 100644
--- a/security/p0f/pkg/PFRAG.mysql
+++ b/security/p0f/pkg/PFRAG.mysql
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PFRAG.mysql,v 1.1 2003/07/19 17:02:06 jose Exp $
+@comment $OpenBSD: PFRAG.mysql,v 1.2 2004/04/14 09:27:52 xsa Exp $
 share/examples/p0f/mysql/p0f-mysql.conf
 share/examples/p0f/mysql/db.sql
 @dirrm share/examples/p0f/mysql
+@cwd ${SYSCONFDIR}
+@extra p0f-mysql.conf
diff --git a/security/p0f/pkg/PLIST b/security/p0f/pkg/PLIST
index 0b93fb62c58..d46189ef532 100644
--- a/security/p0f/pkg/PLIST
+++ b/security/p0f/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2003/07/19 17:02:06 jose Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/04/14 09:27:52 xsa Exp $
 bin/p0f
 bin/p0frep
 share/doc/p0f/README
@@ -6,3 +6,5 @@ share/examples/p0f/p0f.fp
 %%mysql%%
 @dirrm share/examples/p0f
 @dirrm share/doc/p0f
+@cwd ${SYSCONFDIR}
+@extra p0f.fp
diff --git a/security/portsentry/pkg/DEINSTALL b/security/portsentry/pkg/DEINSTALL
index c246c5e08c6..1b3fab0481b 100644
--- a/security/portsentry/pkg/DEINSTALL
+++ b/security/portsentry/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2001/11/26 16:07:12 kevlo Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2004/04/14 09:27:52 xsa Exp $
 #
 # lftp de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/portsentry.conf
 
-if [ -e $CONFIG_FILE ]; then
+if [ ${PKG_DELETE_EXTRA} != Yes -a -f $CONFIG_FILE ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/security/portsentry/pkg/PLIST b/security/portsentry/pkg/PLIST
index b9a4f44efb8..eeadce0dc85 100644
--- a/security/portsentry/pkg/PLIST
+++ b/security/portsentry/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/11/26 16:07:12 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/04/14 09:27:52 xsa Exp $
 bin/portsentry
 lib/portsentry/portsentry.ignore
 share/doc/portsentry/README.install
@@ -8,3 +8,5 @@ share/examples/portsentry/portsentry.conf-sample
 @dirrm share/examples/portsentry
 @dirrm share/doc/portsentry
 @dirrm lib/portsentry
+@cwd ${SYSCONFDIR}
+@extra portsentry.conf
diff --git a/security/siphon/pkg/DEINSTALL b/security/siphon/pkg/DEINSTALL
index 5c7f35b461e..a0b8473ab19 100644
--- a/security/siphon/pkg/DEINSTALL
+++ b/security/siphon/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2002/03/25 06:30:38 jsyn Exp $
+# $OpenBSD: DEINSTALL,v 1.4 2004/04/14 09:27:52 xsa Exp $
 #
 # siphon de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/osprints.conf
 
-if [ -f ${CONFIG_FILE} ]; then
+if [ ${PKG_DELETE_EXTRA} != Yes -a -f ${CONFIG_FILE} ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/security/siphon/pkg/PLIST b/security/siphon/pkg/PLIST
index ff13b84f8ec..97ff6e4f738 100644
--- a/security/siphon/pkg/PLIST
+++ b/security/siphon/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/06/16 14:56:26 lebel Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/04/14 09:27:52 xsa Exp $
 bin/siphon
 share/doc/siphon/LICENSE
 share/doc/siphon/README
 share/examples/siphon/osprints.conf
 @dirrm share/examples/siphon
 @dirrm share/doc/siphon
+@cwd ${SYSCONFDIR}
+@extra osprints.conf