diff --git a/mail/Makefile b/mail/Makefile
index 227789ed1075..3d22ef0d60eb 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -103,6 +103,7 @@
     SUBDIR += dovecot-managesieve
     SUBDIR += dovecot-sieve
     SUBDIR += dovecot2
+    SUBDIR += dovecot2-antispam-plugin
     SUBDIR += dovecot2-pigeonhole
     SUBDIR += drac
     SUBDIR += dracmail
diff --git a/mail/dovecot2-antispam-plugin/Makefile b/mail/dovecot2-antispam-plugin/Makefile
new file mode 100644
index 000000000000..33ce68316424
--- /dev/null
+++ b/mail/dovecot2-antispam-plugin/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for:	dovecot2-antispam-plugin
+# Date created:		Sat Jan 15 15:46:01 CET 2011
+# Whom:			Denis Shaposhnikov <dsh@bamus.cz>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	dovecot2-antispam-plugin
+PORTVERSION=	20101222
+CATEGORIES=	mail
+MASTER_SITES=	http://www.bamus.cz/distfiles/
+DISTFILES=	dovecot-antispam-plugin-${DISTVERSION}${EXTRACT_SUFX}
+
+MAINTAINER=	dsh@bamus.cz
+COMMENT=	The dovecot 2.x plugin for spam systems training.
+
+BUILD_DEPENDS=	${RUN_DEPENDS} \
+		gawk:${PORTSDIR}/lang/gawk
+RUN_DEPENDS=	dovecot>=2.0.7:${PORTSDIR}/mail/dovecot2
+
+CONFLICTS=	dovecot-antispam-1.*
+WRKSRC=		${WRKDIR}/dovecot-antispam-plugin-43880985e3dd
+
+USE_AUTOTOOLS=	aclocal autoheader autoconf
+USE_BZIP2=	yes
+USE_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	${PREFIX}/lib/dovecot
+
+ACLOCAL_ARGS=	-I m4
+
+MAN7=		dovecot-antispam.7
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/mail/dovecot2-antispam-plugin/distinfo b/mail/dovecot2-antispam-plugin/distinfo
new file mode 100644
index 000000000000..f6f03081b6e5
--- /dev/null
+++ b/mail/dovecot2-antispam-plugin/distinfo
@@ -0,0 +1,2 @@
+SHA256 (dovecot-antispam-plugin-20101222.tar.bz2) = 3b72e3d6ac639abb64356ca330a2e41f183c11452d563ed8ac4a0f7b4ea55582
+SIZE (dovecot-antispam-plugin-20101222.tar.bz2) = 55753
diff --git a/mail/dovecot2-antispam-plugin/pkg-descr b/mail/dovecot2-antispam-plugin/pkg-descr
new file mode 100644
index 000000000000..31b09bf74fe3
--- /dev/null
+++ b/mail/dovecot2-antispam-plugin/pkg-descr
@@ -0,0 +1,16 @@
+The dovecot antispam plugin is aimed to help in spam systems training.
+Consider the following scenario. Your mailbox is flooded with tons of
+mail.  They are delivered to the configured folders based on the
+arbitrary spam system judgement. This judgement is not always correct
+or not always what you would like it to be, however. This is where
+this plugin comes into play.
+
+All you have to do is move the mail into the correct folder. All the
+rest in order to let the spam system know it made an error will be
+done automatically by this plugin.
+
+It watches for when you move the mail to some folder and acts
+accordingly.  The advantage of this approach is that the mail ends up
+in the right target folder directly and needs not be touched twice.
+
+WWW: http://hg.dovecot.org/dovecot-antispam-plugin/
diff --git a/mail/dovecot2-antispam-plugin/pkg-message b/mail/dovecot2-antispam-plugin/pkg-message
new file mode 100644
index 000000000000..7b55f76cda90
--- /dev/null
+++ b/mail/dovecot2-antispam-plugin/pkg-message
@@ -0,0 +1,10 @@
+---------------------------------------------------------------------
+ 
+This port assumes you are known with Dovecot and have it installed and
+running on the system you have installed this plugin on.
+
+Further information on configuration can be found at:
+ 
+    man 7 dovecot-antispam
+
+---------------------------------------------------------------------
diff --git a/mail/dovecot2-antispam-plugin/pkg-plist b/mail/dovecot2-antispam-plugin/pkg-plist
new file mode 100644
index 000000000000..08e82ec0a5e0
--- /dev/null
+++ b/mail/dovecot2-antispam-plugin/pkg-plist
@@ -0,0 +1,2 @@
+lib/dovecot/lib90_antispam_plugin.so
+@dirrmtry lib/dovecot