diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 32757c86e09..b7da711b1a6 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2008/02/16 09:26:37 jakob Exp $
+# $OpenBSD: Makefile,v 1.21 2008/03/29 12:01:58 jakob Exp $
 
 COMMENT=	DKIM milter
 
-DISTNAME=	dkim-milter-2.4.4
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	dkim-milter-2.5.2
+PKGNAME=	${DISTNAME}
 CATEGORIES=	mail
 HOMEPAGE=	http://sourceforge.net/projects/dkim-milter/
 
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index 117ac88df50..966779e4556 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,5 +1,5 @@
-MD5 (dkim-milter-2.4.4.tar.gz) = E2fUL9szVHvqSaRcEynNlA==
-RMD160 (dkim-milter-2.4.4.tar.gz) = dE0Wf4atCbDzhWVn+BJ4fRj0A0k=
-SHA1 (dkim-milter-2.4.4.tar.gz) = DpRb3Ke3DWsUeM4+AXH4Aj3lDfI=
-SHA256 (dkim-milter-2.4.4.tar.gz) = 4EMjwdkBQ3+Iwcgb0FEYkQmGAn7FYn1oJZVoF4wFgzs=
-SIZE (dkim-milter-2.4.4.tar.gz) = 617230
+MD5 (dkim-milter-2.5.2.tar.gz) = BnlkmytlGr2QKPt/Hi3KNQ==
+RMD160 (dkim-milter-2.5.2.tar.gz) = bJsoWvfHN5Kv3hJwtSfiRy1VRPk=
+SHA1 (dkim-milter-2.5.2.tar.gz) = CGK56k0b++BLuMsSQPCxeD1aCiw=
+SHA256 (dkim-milter-2.5.2.tar.gz) = NnWCFDgV3c6p90lL6x2/wZ5eqRiw+8H4lgUbsA7iBDI=
+SIZE (dkim-milter-2.5.2.tar.gz) = 641510
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 e0da0583495..d2d8ff435ad 100644
--- a/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_8
+++ b/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_8
@@ -1,7 +1,7 @@
-$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
+$OpenBSD: patch-dkim-filter_dkim-filter_8,v 1.4 2008/03/29 12:01:58 jakob Exp $
+--- dkim-filter/dkim-filter.8.orig	Mon Mar 24 23:56:55 2008
++++ dkim-filter/dkim-filter.8	Sat Mar 29 12:43:12 2008
+@@ -306,6 +306,7 @@ and primary group ID of the named
  unless an alternate
  .I group
  is specified.
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 32dfef2b132..98a0647db5b 100644
--- a/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_c
+++ b/mail/dkim-milter/patches/patch-dkim-filter_dkim-filter_c
@@ -1,12 +1,12 @@
-$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)
+$OpenBSD: patch-dkim-filter_dkim-filter_c,v 1.7 2008/03/29 12:01:58 jakob Exp $
+--- dkim-filter/dkim-filter.c.orig	Fri Mar 28 00:07:10 2008
++++ dkim-filter/dkim-filter.c	Sat Mar 29 12:51:33 2008
+@@ -6382,7 +6382,7 @@ main(int argc, char **argv)
+ 	unsigned long tmpl;
  	const char *args = CMDLINEOPTS;
  	FILE *f;
- 	char *be = NULL;
 -	char *become = NULL;
 +	char *become = "_dkim-milter";
- 	char *domlist = NULL;
- 	char *mtalist = NULL;
  	char *p;
+ 	char *pidfile = NULL;
+ #if POPAUTH
diff --git a/mail/dkim-milter/patches/patch-libdkim_dkim_h b/mail/dkim-milter/patches/patch-libdkim_dkim_h
index 97148dbf458..625cb792213 100644
--- a/mail/dkim-milter/patches/patch-libdkim_dkim_h
+++ b/mail/dkim-milter/patches/patch-libdkim_dkim_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libdkim_dkim_h,v 1.1 2008/02/16 09:26:37 jakob Exp $
---- libdkim/dkim.h.orig	Sat Feb 16 10:21:47 2008
-+++ libdkim/dkim.h	Sat Feb 16 10:23:23 2008
-@@ -22,6 +22,10 @@ static char dkim_h_id[] = "@(#)$Id: dkim
+$OpenBSD: patch-libdkim_dkim_h,v 1.2 2008/03/29 12:01:58 jakob Exp $
+--- libdkim/dkim.h.orig	Sun Mar 23 08:38:38 2008
++++ libdkim/dkim.h	Sat Mar 29 12:43:12 2008
+@@ -22,6 +22,10 @@ static char dkim_h_id[] = "@(#)$Id: dkim.h,v 1.171 200
  /* openssl includes */
  #include <openssl/sha.h>