diff --git a/bin/vmail-dkim-del.sh b/bin/vmail-dkim-del.sh
index 060f77f..f4fa20a 100755
--- a/bin/vmail-dkim-del.sh
+++ b/bin/vmail-dkim-del.sh
@@ -12,12 +12,12 @@ help()
 {
   thisfilename=$(basename -- "$0")
   echo "$thisfilename"
-  echo "Get email alias data from vmail database."
+  echo "Remove DKIM key(s) from server for specified domain."
   echo ""
   echo "usage: $thisfilename -d <domain> [-h]"
   echo ""
   echo "  -h          Print this help."
-  echo "  -d          Domain name to remove DKIM key from."
+  echo "  -d          Domain name to remove DKIM keys for."
   echo ""
   echo "              DKIM key for the specified domain is removed from the server and"
   echo "              outgoing emails will no longer be signed with DKIM. You should also"
@@ -30,19 +30,39 @@ vmail:getoptions "$@"
 
 # check for domain
 if [[ -z $domain ]]; then
-  echo "domain name is required"
-  exit
+  echo "Domain name is required."
+  exit 1
 fi
 
 # check for existing dkim
 if [ ! -f /etc/ssl/dkim/$domain.dkim ]; then
-  echo "dkim for $domain does not exist"
+  echo "DKIM for $domain does not exist."
   exit 1
 fi
 
-echo delete this dkim dns record
-echo
-cat /etc/ssl/dkim/$domain.dns
-echo
+if [[ -f /etc/ssl/dkim/$domain.selector ]]; then
+  echo Deleting the `cat /etc/ssl/dkim/$domain.selector`._domainkey.$domain DKIM key.
+  if [[ -f /usr/local/etc/pdns.conf ]] &&
+    echo To remove the associated DNS record run this command:
+    echo
+    echo pdns-rr-del.sh -z $domain -n `cat /etc/ssl/dkim/$domain.selector`._domainkey.$domain -t TXT
+  else
+    echo You can now delete the DNS TXT record for `cat /etc/ssl/dkim/$domain.selector`._domainkey.$domain
+  fi
+else
+  echo You can now delete the associated DNS TXT record.
+fi
 
-rm /etc/ssl/dkim/$domain.*
+rm /etc/ssl/dkim/$domain.dkim
+if [ ! -f /etc/ssl/dkim/$domain.dns ]; then
+  rm /etc/ssl/dkim/$domain.dns
+fi
+if [ ! -f /etc/ssl/dkim/$domain.pem ]; then
+  rm /etc/ssl/dkim/$domain.pem
+fi
+if [ ! -f /etc/ssl/dkim/$domain.pub ]; then
+  rm /etc/ssl/dkim/$domain.pub
+fi
+if [ ! -f /etc/ssl/dkim/$domain.selector ]; then
+  rm /etc/ssl/dkim/$domain.selector
+fi