diff --git a/mail/libdkim/fix-warnings.patch b/mail/libdkim/fix_warnings.patch
similarity index 93%
rename from mail/libdkim/fix-warnings.patch
rename to mail/libdkim/fix_warnings.patch
index c6907429e..97419c83f 100644
--- a/mail/libdkim/fix-warnings.patch
+++ b/mail/libdkim/fix_warnings.patch
@@ -2,8 +2,8 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
-# Filename: package/.../libdkim/fix-warnings.patch
-# Copyright (C) 2009 The OpenSDE Project
+# Filename: package/.../libdkim/fix_warnings.patch
+# Copyright (C) 2013 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -291,17 +291,6 @@ diff -ru libdkim-1.0.19.orig/src/dkimverify.cpp libdkim-1.0.19/src/dkimverify.cp
  		{
  			if (values[j] != NULL && values[j] < values[0])
  			{
-@@ -1411,8 +1411,8 @@
- 				return DKIM_POLICY_DNS_PERM_FAILURE;
- 			}
- 
--			unsigned pos = sDomain.find('.');
--			if (pos == -1 || sDomain.find('.', pos+1) == -1)
-+			string::size_type pos = sDomain.find('.');
-+			if (pos == string::npos || sDomain.find('.', pos+1) == string::npos)
- 			{
- 				// SSP not found but the domain exists, it's non-suspicious
- 				iSSP = DKIM_SSP_UNKNOWN;
 diff -ru libdkim-1.0.19.orig/src/libdkimtest.cpp libdkim-1.0.19/src/libdkimtest.cpp
 --- ./libdkimtest.cpp	2008-05-12 20:08:54.000000000 +1000
 +++ ./libdkimtest.cpp	2009-04-15 19:38:08.000000000 +1000
diff --git a/mail/libdkim/libdkim.desc b/mail/libdkim/libdkim.desc
index 478052e2a..924767f42 100644
--- a/mail/libdkim/libdkim.desc
+++ b/mail/libdkim/libdkim.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../libdkim/libdkim.desc
-[COPY] Copyright (C) 2009 The OpenSDE Project
+[COPY] Copyright (C) 2009 - 2013 The OpenSDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
 [COPY]
@@ -27,7 +27,7 @@
 
 [L] APL
 [S] Beta
-[V] 1.0.19
+[V] 1.0.21
 [P] X -----5---9 800.000
 
-[D] 2617769788 libdkim-1.0.19.zip  http://dl.sourceforge.net/sourceforge/libdkim/
+[D] 2718052893 libdkim-1.0.21.zip http://dl.sourceforge.net/sourceforge/libdkim/
diff --git a/mail/libdkim/enable-thread-safety.patch b/mail/libdkim/strtok_r.patch
similarity index 81%
rename from mail/libdkim/enable-thread-safety.patch
rename to mail/libdkim/strtok_r.patch
index 68dd9ac8a..78c39a3bc 100644
--- a/mail/libdkim/enable-thread-safety.patch
+++ b/mail/libdkim/strtok_r.patch
@@ -2,8 +2,8 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
-# Filename: package/.../libdkim/enable-thread-safety.patch
-# Copyright (C) 2009 The OpenSDE Project
+# Filename: package/.../libdkim/strtok_r.patch
+# Copyright (C) 2013 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -133,31 +133,3 @@ diff -ru libdkim-1.0.19/src/dkimverify.cpp libdkim-1.0.19-new/src/dkimverify.cpp
  		}
  	}
  
-@@ -1388,6 +1394,9 @@
- ////////////////////////////////////////////////////////////////////////////////
- int CDKIMVerify::GetSSP( const string &sDomain, int &iSSP, bool &bTesting )
- {
-+	// for strtok_r()
-+	char *saveptr;
-+
- 	string sFQDN = "_ssp._domainkey.";
- 	sFQDN += sDomain;
- 
-@@ -1456,7 +1465,7 @@
- 			// flags
- 			if (values[1] != NULL)
- 			{
--				char *s = strtok(values[1], "|");
-+				char *s = strtok_r(values[1], "|", &saveptr);
- 				while (s != NULL)
- 				{
- 					if (strcmp(s, "y") == 0)
-@@ -1474,7 +1483,7 @@
- 							return DKIM_SUCCESS;
- 						}
- 					}
--					s = strtok(NULL, "|");
-+					s = strtok_r(NULL, "|", &saveptr);
- 				}
- 			}
- 		}