diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile
index 6042a6fe75d..f88411fa9d9 100644
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2012/03/22 10:47:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2013/03/06 15:12:01 benoit Exp $
 
 COMMENT=	fetch, filter and deliver mail
 
-DISTNAME=	fdm-1.6
-REVISION=	3
+DISTNAME=	fdm-1.7
 CATEGORIES=	mail
 
 HOMEPAGE=	http://fdm.sourceforge.net/
@@ -23,6 +22,10 @@ LIB_DEPENDS +=	databases/tdb>=1.2.7
 
 FAKE_FLAGS=	PREFIX=${PREFIX}
 
+pre-build:
+	cd ${WRKSRC} && ksh configure
+	cd ${WRKSRC} && awk -ftools/makemanual.awk < MANUAL.in > MANUAL
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/fdm
 	${INSTALL_SCRIPT} ${WRKSRC}/fdm-sanitize ${PREFIX}/share/fdm
diff --git a/mail/fdm/distinfo b/mail/fdm/distinfo
index dfe21e9e7f0..373a86cba5d 100644
--- a/mail/fdm/distinfo
+++ b/mail/fdm/distinfo
@@ -1,5 +1,2 @@
-MD5 (fdm-1.6.tar.gz) = srm/6VIXspAUK94WIeuaNw==
-RMD160 (fdm-1.6.tar.gz) = fiyEa5fc4g4SO4RTcy4Qf4jg3o8=
-SHA1 (fdm-1.6.tar.gz) = +4BC8jVQYoSP8ULJYEBptmV+aoI=
-SHA256 (fdm-1.6.tar.gz) = cmmkCic3j0nA08yStCKdHgZrukhu+f+FyqLsTLzqNwY=
-SIZE (fdm-1.6.tar.gz) = 192159
+SHA256 (fdm-1.7.tar.gz) = SER0CU8STOQ4yJ36sFUZ/ns6qMg0bQD3kKUSq5UM7yo=
+SIZE (fdm-1.7.tar.gz) = 199808
diff --git a/mail/fdm/patches/patch-db-tdb_c b/mail/fdm/patches/patch-db-tdb_c
deleted file mode 100644
index d6ba1562998..00000000000
--- a/mail/fdm/patches/patch-db-tdb_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-db-tdb_c,v 1.3 2011/09/26 09:31:16 sthen Exp $
---- db-tdb.c.orig	Sat Sep 17 10:50:23 2011
-+++ db-tdb.c	Sat Sep 17 10:50:50 2011
-@@ -22,6 +22,9 @@
- #include <fcntl.h>
- #include <signal.h>
- #include <string.h>
-+#ifndef _PUBLIC_
-+#define _PUBLIC_
-+#endif
- #include <tdb.h>
- 
- #include "fdm.h"
diff --git a/mail/fdm/patches/patch-deliver-smtp_c b/mail/fdm/patches/patch-deliver-smtp_c
deleted file mode 100644
index 1fc7f487955..00000000000
--- a/mail/fdm/patches/patch-deliver-smtp_c
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-deliver-smtp_c,v 1.1 2012/03/22 10:47:14 sthen Exp $
-
-From r1.58 upstream: properly escape . when delivering to SMTP.
-
---- deliver-smtp.c.orig	Sun Dec 14 21:34:06 2008
-+++ deliver-smtp.c	Wed Mar 21 22:59:50 2012
-@@ -160,8 +160,11 @@ deliver_smtp_deliver(struct deliver_ctx *dctx, struct 
- 				goto error;
- 			line_init(m, &ptr, &len);
- 			while (ptr != NULL) {
--				if (len > 1)
-+				if (len > 1) {
-+					if (*ptr == '.')
-+						io_write(io, ".", 1);
- 					io_write(io, ptr, len - 1);
-+				}
- 				io_writeline(io, NULL);
- 
- 				/* Update if necessary. */
diff --git a/mail/fdm/patches/patch-fdm_h b/mail/fdm/patches/patch-fdm_h
deleted file mode 100644
index a452d76a4f6..00000000000
--- a/mail/fdm/patches/patch-fdm_h
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-fdm_h,v 1.3 2011/09/26 09:31:16 sthen Exp $
---- fdm.h.orig	Sat Sep 17 10:48:21 2011
-+++ fdm.h	Sat Sep 17 10:50:00 2011
-@@ -39,6 +39,9 @@
- #include <signal.h>
- #include <stdarg.h>
- #include <stdint.h>
-+#ifndef _PUBLIC_
-+#define _PUBLIC_
-+#endif
- #include <tdb.h>
- #include <regex.h>
- 
diff --git a/mail/fdm/pkg/PLIST b/mail/fdm/pkg/PLIST
index 2d02fce3fd1..e8ee471981e 100644
--- a/mail/fdm/pkg/PLIST
+++ b/mail/fdm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2009/01/06 22:00:19 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.6 2013/03/06 15:12:05 benoit Exp $
 @bin bin/fdm
 @man man/man1/fdm.1
 @man man/man5/fdm.conf.5
@@ -8,7 +8,6 @@ share/doc/fdm/README
 share/examples/fdm/
 share/examples/fdm/f-terbeck.conf
 share/examples/fdm/g-lando.conf
-share/examples/fdm/n-marriott-old.conf
 share/examples/fdm/n-marriott.conf
 share/examples/fdm/t-ulmer.conf
 share/examples/fdm/w-maier.conf