diff --git a/archivers/gtar/pkg/DEINSTALL b/archivers/gtar/pkg/DEINSTALL
index 048c7e29c1f..5fedaf5a9c8 100644
--- a/archivers/gtar/pkg/DEINSTALL
+++ b/archivers/gtar/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/04/09 22:30:48 marc Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:17 brad Exp $
 #
 # gtar de-installation
 
diff --git a/comms/minicom/pkg/DEINSTALL b/comms/minicom/pkg/DEINSTALL
index 8338200a1e9..d4b690129f7 100644
--- a/comms/minicom/pkg/DEINSTALL
+++ b/comms/minicom/pkg/DEINSTALL
@@ -1,6 +1,7 @@
-# $OpenBSD: DEINSTALL,v 1.1 2000/05/18 04:41:32 form Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:17 brad Exp $
 #
-# joe de-installation
+# minicom de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
diff --git a/editors/joe/pkg/DEINSTALL b/editors/joe/pkg/DEINSTALL
index 25cadf53f89..ce7f2417ae4 100644
--- a/editors/joe/pkg/DEINSTALL
+++ b/editors/joe/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 2000/05/17 04:23:39 form Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:17 brad Exp $
 #
 # joe de-installation
 
diff --git a/emulators/linux_lib/pkg/DEINSTALL b/emulators/linux_lib/pkg/DEINSTALL
index 218ef12b883..94f5a12cdfd 100644
--- a/emulators/linux_lib/pkg/DEINSTALL
+++ b/emulators/linux_lib/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 2000/06/20 18:35:15 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:19 brad Exp $
 #
 # linux_lib de-installation
 
diff --git a/games/dopewars/pkg/DEINSTALL b/games/dopewars/pkg/DEINSTALL
index df78bcae391..197b68d3c19 100644
--- a/games/dopewars/pkg/DEINSTALL
+++ b/games/dopewars/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/10/26 21:21:18 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:19 brad Exp $
 #
 # dopewars de-installation
 
diff --git a/graphics/fnlib/pkg/DEINSTALL b/graphics/fnlib/pkg/DEINSTALL
index 3ae4da2c41b..65ed0934338 100644
--- a/graphics/fnlib/pkg/DEINSTALL
+++ b/graphics/fnlib/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.2 2000/06/15 18:39:30 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.3 2000/07/19 09:31:20 brad Exp $
 #
 # fnlib de-installation
 
diff --git a/mail/cucipop/pkg/DEINSTALL b/mail/cucipop/pkg/DEINSTALL
index e4728b0a4bb..18031bb5690 100644
--- a/mail/cucipop/pkg/DEINSTALL
+++ b/mail/cucipop/pkg/DEINSTALL
@@ -1,6 +1,7 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/04/08 23:13:53 marc Exp $
+#!/bin/bin
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:20 brad Exp $
 #
-# xtnpd de-installation
+# cucipop de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
diff --git a/mail/metamail/pkg/DEINSTALL b/mail/metamail/pkg/DEINSTALL
index aec72bd1a6e..6cb399fd4c8 100644
--- a/mail/metamail/pkg/DEINSTALL
+++ b/mail/metamail/pkg/DEINSTALL
@@ -1,6 +1,7 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/04/08 22:41:17 marc Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:20 brad Exp $
 #
-# mm de-installation
+# metamail de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
diff --git a/net/icb/pkg/DEINSTALL b/net/icb/pkg/DEINSTALL
index 2f74d749af1..5d4aaaec520 100644
--- a/net/icb/pkg/DEINSTALL
+++ b/net/icb/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/12/14 04:17:15 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:20 brad Exp $
 #
 # icb de-installation
 
diff --git a/net/ipfm/pkg/DEINSTALL b/net/ipfm/pkg/DEINSTALL
index bd741533fb6..8e4acfca7b1 100644
--- a/net/ipfm/pkg/DEINSTALL
+++ b/net/ipfm/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2000/06/23 18:44:42 form Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:21 brad Exp $
 #
 # ipfm de-installation
 
diff --git a/net/mrtg/pkg/DEINSTALL b/net/mrtg/pkg/DEINSTALL
index e7c60ea4fc0..8b36d9d1169 100644
--- a/net/mrtg/pkg/DEINSTALL
+++ b/net/mrtg/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.3 2000/01/21 00:37:12 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.4 2000/07/19 09:31:21 brad Exp $
 #
 # mrtg de-installation
 
diff --git a/net/netatalk/pkg/DEINSTALL b/net/netatalk/pkg/DEINSTALL
index 250a4b8cc2b..f604c029495 100644
--- a/net/netatalk/pkg/DEINSTALL
+++ b/net/netatalk/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/05/25 14:39:43 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:21 brad Exp $
 #
 # netatalk de-installation
 
diff --git a/net/popa3d/pkg/DEINSTALL b/net/popa3d/pkg/DEINSTALL
index 3bedb06187e..0eb4120ebc7 100644
--- a/net/popa3d/pkg/DEINSTALL
+++ b/net/popa3d/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.2 2000/02/09 08:37:32 camield Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.3 2000/07/19 09:31:21 brad Exp $
 
 PATH=/bin
 
diff --git a/net/proxy-suite/pkg/DEINSTALL b/net/proxy-suite/pkg/DEINSTALL
index 054b8a1b881..8b5e5094c01 100644
--- a/net/proxy-suite/pkg/DEINSTALL
+++ b/net/proxy-suite/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 2000/03/06 13:34:10 camield Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:21 brad Exp $
 #
 # proxy-suite de-installation
 
diff --git a/net/queso/pkg/DEINSTALL b/net/queso/pkg/DEINSTALL
index de9247e39d7..8071cd69154 100644
--- a/net/queso/pkg/DEINSTALL
+++ b/net/queso/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 2000/03/25 06:50:03 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:22 brad Exp $
 #
 # queso de-installation
 
diff --git a/net/samba/pkg/DEINSTALL b/net/samba/pkg/DEINSTALL
index 4022189e1c9..0fff7645054 100644
--- a/net/samba/pkg/DEINSTALL
+++ b/net/samba/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/05/30 23:03:00 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:22 brad Exp $
 #
 # samba de-installation
 
diff --git a/net/trafshow/pkg/DEINSTALL b/net/trafshow/pkg/DEINSTALL
index dfae8f1193c..5edc395d701 100644
--- a/net/trafshow/pkg/DEINSTALL
+++ b/net/trafshow/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 2000/04/23 15:35:48 kevlo Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:22 brad Exp $
 #
 # trafshow de-installation
 
diff --git a/net/vtun/pkg/DEINSTALL b/net/vtun/pkg/DEINSTALL
index ceb7fbcaaaa..a52aba7a92a 100644
--- a/net/vtun/pkg/DEINSTALL
+++ b/net/vtun/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.2 2000/02/07 08:44:04 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.3 2000/07/19 09:31:22 brad Exp $
 #
 # vtun de-installation
 
diff --git a/net/ytalk/pkg/DEINSTALL b/net/ytalk/pkg/DEINSTALL
index e712985ee92..be924b45ab6 100644
--- a/net/ytalk/pkg/DEINSTALL
+++ b/net/ytalk/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/04/22 15:26:59 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:22 brad Exp $
 #
 # ytalk de-installation
 
diff --git a/russian/xcyrillic/pkg/DEINSTALL b/russian/xcyrillic/pkg/DEINSTALL
index 0987b362b63..e45aba03d7e 100644
--- a/russian/xcyrillic/pkg/DEINSTALL
+++ b/russian/xcyrillic/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.2 2000/03/29 20:23:04 form Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.3 2000/07/19 09:31:23 brad Exp $
 #
 # xcyrillic de-installation
 
diff --git a/russian/xruskb/pkg/DEINSTALL b/russian/xruskb/pkg/DEINSTALL
index de55f06f4be..6f278a6e567 100644
--- a/russian/xruskb/pkg/DEINSTALL
+++ b/russian/xruskb/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 2000/03/12 13:20:41 form Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:23 brad Exp $
 #
 # xruskb de-installation
 
diff --git a/shells/bash/pkg/DEINSTALL b/shells/bash/pkg/DEINSTALL
index 4bd7ada93d6..27d3f4fa304 100644
--- a/shells/bash/pkg/DEINSTALL
+++ b/shells/bash/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/12/10 15:16:59 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:23 brad Exp $
 #
 # bash de-installation
 
diff --git a/shells/bash2/pkg/DEINSTALL b/shells/bash2/pkg/DEINSTALL
index 98d0f03eb14..40db4a1107f 100644
--- a/shells/bash2/pkg/DEINSTALL
+++ b/shells/bash2/pkg/DEINSTALL
@@ -1,6 +1,7 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/04/08 15:37:28 marc Exp $
+#!/bin/sh2
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:23 brad Exp $
 #
-# bash de-installation
+# bash2 de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
diff --git a/shells/es/pkg/DEINSTALL b/shells/es/pkg/DEINSTALL
index b0b74bc31a8..69ba1450cd6 100644
--- a/shells/es/pkg/DEINSTALL
+++ b/shells/es/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 2000/03/26 00:36:15 espie Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:24 brad Exp $
 #
 # zsh de-installation
 
diff --git a/shells/scsh/pkg/DEINSTALL b/shells/scsh/pkg/DEINSTALL
index 27179d9a5be..9822a770dd4 100644
--- a/shells/scsh/pkg/DEINSTALL
+++ b/shells/scsh/pkg/DEINSTALL
@@ -1,6 +1,7 @@
-# $OpenBSD: DEINSTALL,v 1.1 2000/03/26 01:10:39 espie Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:24 brad Exp $
 #
-# zsh de-installation
+# scsh de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
diff --git a/shells/tcsh/pkg/DEINSTALL b/shells/tcsh/pkg/DEINSTALL
index ce054eed3da..7431ea73c09 100644
--- a/shells/tcsh/pkg/DEINSTALL
+++ b/shells/tcsh/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/04/08 15:53:29 marc Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:24 brad Exp $
 #
 # tcsh de-installation
 
diff --git a/shells/zsh-devel/pkg/DEINSTALL b/shells/zsh-devel/pkg/DEINSTALL
index 52474ae4a2a..23c3e9a2b77 100644
--- a/shells/zsh-devel/pkg/DEINSTALL
+++ b/shells/zsh-devel/pkg/DEINSTALL
@@ -1,6 +1,7 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/10/07 19:52:34 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:25 brad Exp $
 #
-# zsh de-installation
+# zsh-devel de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
diff --git a/shells/zsh/pkg/DEINSTALL b/shells/zsh/pkg/DEINSTALL
index 3ff34f8e8c2..66105fb71bf 100644
--- a/shells/zsh/pkg/DEINSTALL
+++ b/shells/zsh/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/10/07 19:49:51 brad Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:25 brad Exp $
 #
 # zsh de-installation
 
diff --git a/www/wwwcount/pkg/DEINSTALL b/www/wwwcount/pkg/DEINSTALL
index 2d9fe556ddf..1c1594d977a 100644
--- a/www/wwwcount/pkg/DEINSTALL
+++ b/www/wwwcount/pkg/DEINSTALL
@@ -1,4 +1,5 @@
-# $OpenBSD: DEINSTALL,v 1.1 2000/01/27 21:14:05 form Exp $
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:25 brad Exp $
 #
 # wwwcount de-installation