diff --git a/databases/mysql/pkg/DEINSTALL-server b/databases/mysql/pkg/DEINSTALL-server
index c7c72fc594e..7577872ab41 100644
--- a/databases/mysql/pkg/DEINSTALL-server
+++ b/databases/mysql/pkg/DEINSTALL-server
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL-server,v 1.6 2003/08/27 00:14:49 brad Exp $
+# $OpenBSD: DEINSTALL-server,v 1.7 2004/01/31 03:08:49 brad Exp $
 #
 # MySQL de-installation
 
@@ -17,8 +17,12 @@ echo "| to perform these steps as root:"
 echo "|"
 echo "|           userdel $MYSQLUSER"
 echo "|           groupdel $MYSQLGROUP"
-echo "|           rm -rf $DB_DIR"
-echo "|           rm -rf $SOCKET_DIR"
+if [ "$PKG_DELETE_EXTRA" != Yes -a -d $DB_DIR ]; then
+    echo "|           rm -rf $DB_DIR"
+fi
+if [ "$PKG_DELETE_EXTRA" != Yes -a -d $SOCKET_DIR ]; then
+    echo "|           rm -rf $SOCKET_DIR"
+fi
 echo "|"
 echo "| Do not do this if you plan on re-installing $1"
 echo "| at some future time."
diff --git a/databases/mysql/pkg/PLIST-server b/databases/mysql/pkg/PLIST-server
index dd82e9f9ba0..68f4041eb91 100644
--- a/databases/mysql/pkg/PLIST-server
+++ b/databases/mysql/pkg/PLIST-server
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-server,v 1.8 2003/12/30 20:07:27 brad Exp $
+@comment $OpenBSD: PLIST-server,v 1.9 2004/01/31 03:08:49 brad Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -215,3 +215,5 @@ share/mysql/ukrainian/errmsg.txt
 @dirrm share/mysql
 @dirrm share/doc/mysql/Flags
 @dirrm share/doc/mysql
+@extraunexec rm -rf ${DB_DIR}
+@extraunexec rm -rf ${SOCKET_DIR}