diff --git a/mail/Makefile b/mail/Makefile
index 0cbfa16ee4b9..3137aec809bb 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -140,6 +140,7 @@
     SUBDIR += ezmlm-idx
     SUBDIR += ezmlm-web
     SUBDIR += faces
+    SUBDIR += fastforward
     SUBDIR += fdm
     SUBDIR += fetchmail
     SUBDIR += filtermail
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
new file mode 100644
index 000000000000..edbca31e6655
--- /dev/null
+++ b/mail/fastforward/Makefile
@@ -0,0 +1,41 @@
+# Created by: Uffe Jakobsen <uffe@uffe.org>
+# $FreeBSD$
+
+PORTNAME=	fastforward
+PORTVERSION=	0.51
+CATEGORIES=	mail
+MASTER_SITES=	http://cr.yp.to/software/
+
+MAINTAINER=	uffe@uffe.org
+COMMENT=	Fastforward handles qmail forwarding according to a cdb database
+
+USES=	gmake
+
+ALL_TARGET=	default
+
+MAN1=	fastforward.1 printforward.1 setforward.1 newaliases.1 printmaillist.1 setmaillist.1 newinclude.1
+CAT1=	fastforward.0 printforward.0 setforward.0 newaliases.0 printmaillist.0 setmaillist.0 newinclude.0
+
+PORTDOCS=	ALIASES
+
+PLIST_FILES=	\
+		bin/fastforward bin/printforward bin/setforward bin/newaliases bin/printmaillist bin/setmaillist bin/newinclude \
+		${MAN1:S,^,man/man1/,:S,$,.gz,} ${CAT1:S,^,man/cat1/,:S,$,.gz,}
+
+do-install:
+.for binfile in fastforward printforward setforward newaliases printmaillist setmaillist newinclude
+	${INSTALL_PROGRAM} ${WRKSRC}/${binfile} ${STAGEDIR}${PREFIX}/bin/${binfile}
+.endfor
+
+.for manfile in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${manfile} ${STAGEDIR}${MAN1PREFIX}/man/man1/${manfile}
+.endfor
+
+.for catfile in ${CAT1}
+	${INSTALL_MAN} ${WRKSRC}/${catfile} ${STAGEDIR}${MAN1PREFIX}/man/cat1/${catfile}
+.endfor
+
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ALIASES ${STAGEDIR}${DOCSDIR}/ALIASES
+
+.include <bsd.port.mk>
diff --git a/mail/fastforward/distinfo b/mail/fastforward/distinfo
new file mode 100644
index 000000000000..a042b28756b8
--- /dev/null
+++ b/mail/fastforward/distinfo
@@ -0,0 +1,2 @@
+SHA256 (fastforward-0.51.tar.gz) = 45a1a071d54701bf973fed7582b5ff76cb6ed3e43089da6da87caabbb4b4fd7e
+SIZE (fastforward-0.51.tar.gz) = 40659
diff --git a/mail/fastforward/pkg-descr b/mail/fastforward/pkg-descr
new file mode 100644
index 000000000000..fa6e022c6b48
--- /dev/null
+++ b/mail/fastforward/pkg-descr
@@ -0,0 +1,5 @@
+fastforward handles qmail forwarding according to a cdb database.
+It can create forwarding databases from a sendmail-style
+/etc/aliases or from user-oriented virtual-domain tables.
+
+WWW: http://cr.yp.to/fastforward.html