diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index f6a05f519e6..f769e84aaee 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2007/08/27 06:52:41 jakob Exp $
+# $OpenBSD: Makefile,v 1.11 2007/09/08 08:46:33 jakob Exp $
 
 COMMENT=	"DKIM milter"
 
-DISTNAME=	dkim-milter-2.1.2
+DISTNAME=	dkim-milter-2.2.1
 PKGNAME=	${DISTNAME}
 CATEGORIES=	mail
 HOMEPAGE=	http://sourceforge.net/projects/dkim-milter/
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index 7875b003f71..1d78c26ae32 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,5 +1,5 @@
-MD5 (dkim-milter-2.1.2.tar.gz) = 6cpfc5virZzxVvUo9GrmCQ==
-RMD160 (dkim-milter-2.1.2.tar.gz) = UB9dxoz3W0sVscI6e9DMJl6SwFY=
-SHA1 (dkim-milter-2.1.2.tar.gz) = Li2z3B3UEX2nj1m05sSeUTHYnSY=
-SHA256 (dkim-milter-2.1.2.tar.gz) = d8n218iGsU3exGKj7ymolzeqWeKgG/Q/YSPdUHFh6Ro=
-SIZE (dkim-milter-2.1.2.tar.gz) = 564677
+MD5 (dkim-milter-2.2.1.tar.gz) = dAHRN5ihQN72+CcFaiV5Aw==
+RMD160 (dkim-milter-2.2.1.tar.gz) = XwlpIeQD57Hyjbo2WsCqs+QKngw=
+SHA1 (dkim-milter-2.2.1.tar.gz) = JEgVdgqL1UKsWfN2meCzvQV9BHs=
+SHA256 (dkim-milter-2.2.1.tar.gz) = jpd6Fvk72qRbFuLhTqeFlZhUaB++4d0OSutmVHOcz94=
+SIZE (dkim-milter-2.2.1.tar.gz) = 567681
diff --git a/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_8 b/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_8
index c85711a7785..e0da0583495 100644
--- a/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_8
+++ b/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_8
@@ -1,10 +1,10 @@
-$OpenBSD: patch-dkim-filter_dkim-filter_8,v 1.2 2007/06/26 21:12:47 jakob Exp $
---- dkim-filter/dkim-filter.8.orig	Mon Jun 25 22:25:47 2007
-+++ dkim-filter/dkim-filter.8	Tue Jun 26 22:59:30 2007
-@@ -248,6 +248,7 @@ See also the NOTES section below.
- Attempts to be come the specified
- .I userid
- before starting operations.
+$OpenBSD: patch-dkim-filter_dkim-filter_8,v 1.3 2007/09/08 08:46:33 jakob Exp $
+--- dkim-filter/dkim-filter.8.orig	Tue Aug 28 19:20:56 2007
++++ dkim-filter/dkim-filter.8	Fri Aug 31 07:00:49 2007
+@@ -256,6 +256,7 @@ and primary group ID of the named
+ unless an alternate
+ .I group
+ is specified.
 +The default is to change user to _dkim-milter.
  .TP
  .I -U popdb
diff --git a/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_c b/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_c
index bcf37c4528c..32dfef2b132 100644
--- a/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_c
+++ b/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-dkim-filter_dkim-filter_c,v 1.5 2007/08/27 06:52:41 jakob Exp $
---- dkim-filter/dkim-filter.c.orig	Wed Aug 15 03:01:12 2007
-+++ dkim-filter/dkim-filter.c	Wed Aug 22 16:06:28 2007
-@@ -4260,7 +4260,7 @@ main(int argc, char **argv)
+$OpenBSD: patch-dkim-filter_dkim-filter_c,v 1.6 2007/09/08 08:46:33 jakob Exp $
+--- dkim-filter/dkim-filter.c.orig	Tue Aug 28 19:20:56 2007
++++ dkim-filter/dkim-filter.c	Fri Aug 31 06:53:10 2007
+@@ -4261,7 +4261,7 @@ main(int argc, char **argv)
  	const char *args = CMDLINEOPTS;
  	FILE *f;
  	char *be = NULL;