diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index b9801388912f..f789583a0b8f 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	imapfilter
-PORTVERSION=	1.3
+PORTVERSION=	2.0.3
 CATEGORIES=	mail
 MASTER_SITES=	http://imapfilter.hellug.gr/source/
 
 MAINTAINER=	stefan@FreeBSD.org
 COMMENT=	IMAP mail filtering utility
 
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+
 USE_BZIP2=	yes
 USE_LUA=	5.1
 USE_OPENSSL=	yes
@@ -25,24 +27,19 @@ MAN1=		imapfilter.1
 MAN5=		imapfilter_config.5
 PORTDOCS=	LICENSE NEWS README
 PLIST_FILES=	bin/imapfilter \
+		%%DATADIR%%/account.lua \
 		%%DATADIR%%/auxiliary.lua \
-		%%DATADIR%%/interface.lua \
+		%%DATADIR%%/common.lua \
+		%%DATADIR%%/deprecated.lua \
+		%%DATADIR%%/mailbox.lua \
+		%%DATADIR%%/message.lua \
+		%%DATADIR%%/options.lua \
+		%%DATADIR%%/regex.lua \
+		%%DATADIR%%/set.lua \
 		%%EXAMPLESDIR%%/sample.config.lua \
 		%%EXAMPLESDIR%%/sample.extend.lua
 PLIST_DIRS=	%%DATADIR%% %%EXAMPLESDIR%%
 
-OPTIONS=	PCRE "Enable Perl Compatible Regular Expressions support" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_PCRE)
-CONFIGURE_ARGS+=	-o pcre=no
-.else
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+=	-o pcre=yes
-PLIST_FILES+=	%%DATADIR%%/regex.lua
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -Ee \
 		's|^(incdirs=).*|\1"${CPPFLAGS}"| ; \
@@ -55,7 +52,6 @@ post-install:
 	${STRIP_CMD} ${PREFIX}/bin/imapfilter
 	@${MKDIR} ${DATADIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} interface.lua auxiliary.lua ${DATADIR} && \
 		${INSTALL_DATA} sample.config.lua sample.extend.lua \
 			${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
@@ -63,4 +59,4 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo
index c4a58b7da7cd..ac79ddc2a568 100644
--- a/mail/imapfilter/distinfo
+++ b/mail/imapfilter/distinfo
@@ -1,3 +1,3 @@
-MD5 (imapfilter-1.3.tar.bz2) = 0894273fc67008325002b360520d922e
-SHA256 (imapfilter-1.3.tar.bz2) = f2559fe4cc40147bc12f6d1ddb44e99aa366c1c44829b3f3051532664e39e759
-SIZE (imapfilter-1.3.tar.bz2) = 34174
+MD5 (imapfilter-2.0.3.tar.bz2) = a7e27aa67af16afadbbcc8d6404c9737
+SHA256 (imapfilter-2.0.3.tar.bz2) = 9df59cf91b54372d4f027307d0a944693b017770986431bb7696f21c07cba231
+SIZE (imapfilter-2.0.3.tar.bz2) = 37929