diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile
index 9d513cf48f81..214a0583d635 100644
--- a/news/cleanfeed/Makefile
+++ b/news/cleanfeed/Makefile
@@ -1,39 +1,48 @@
 # Created by: Yen-Ming Lee <leeym@cae.ce.ntu.edu.tw>
 
 PORTNAME=	cleanfeed
-DISTVERSION=	20190602
+DISTVERSION=	20200402
 CATEGORIES=	news
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	crooks
-GH_TAGNAME=	b3c6bcf6e34a6d35cad402d34c7ff76aba481c6d
+GH_TAGNAME=	dd177d4a3b6ea2e538da17bbb2a74772cea4a49a
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT=	Spam filter for Usenet news servers
 
-RUN_DEPENDS=	${LOCALBASE}/news/bin/innd:news/inn
+FLAVORS=                        inn inncurrent
+FLAVOR?=                        ${FLAVORS:[1]}
 
+inn_CONFLICTS_INSTALL=		cleanfeed-CURRENT
+inn_RUN_DEPENDS=		${LOCALBASE}/news/bin/innd:news/inn
+
+inncurrent_PKGNAMESUFFIX=	-CURRENT
+inncurrent_CONFLICTS_INSTALL=	cleanfeed
+inncurrent_RUN_DEPENDS=		${LOCALBASE}/news/bin/innd:news/inn-CURRENT
+
+NO_ARCH=	yes
 NO_BUILD=	yes
 USES=		perl5
 BINOWN=		news
 BINGRP=		news
 SHAREOWN=	news
 SHAREGRP=	news
 INSTALL+=	-b
 PKGDEINSTALL=	${PKGINSTALL}
 
 post-patch:
 	@${REINPLACE_CMD} -e "/debug_batch_directory/s:'.*':'/var/log/cleanfeed':" ${WRKSRC}/samples/cleanfeed.local
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/news/cleanfeed/etc
 .for f in bad_adult_paths bad_body bad_cancel_paths bad_from bad_groups \
 		bad_hosts bad_paths bad_subject bad_url
 	@${INSTALL_DATA} ${WRKSRC}/samples/${f} ${STAGEDIR}${PREFIX}/news/cleanfeed/etc
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/samples/cleanfeed.local \
 		${STAGEDIR}${PREFIX}/news/cleanfeed/etc/cleanfeed.local.sample
 	@${MKDIR} ${STAGEDIR}${PREFIX}/news/bin/filter
 	@${INSTALL_DATA} ${WRKSRC}/cleanfeed ${STAGEDIR}${PREFIX}/news/bin/filter
 
 .include <bsd.port.mk>
diff --git a/news/cleanfeed/distinfo b/news/cleanfeed/distinfo
index 25c8bbe33b33..41d8b02be25b 100644
--- a/news/cleanfeed/distinfo
+++ b/news/cleanfeed/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572996270
-SHA256 (crooks-cleanfeed-20190602-b3c6bcf6e34a6d35cad402d34c7ff76aba481c6d_GH0.tar.gz) = 88a4d4eacad05e2171f308158e9d6d5c64f4d944c605272425e0f9055be4f2b7
-SIZE (crooks-cleanfeed-20190602-b3c6bcf6e34a6d35cad402d34c7ff76aba481c6d_GH0.tar.gz) = 58644
+TIMESTAMP = 1623473306
+SHA256 (crooks-cleanfeed-20200402-dd177d4a3b6ea2e538da17bbb2a74772cea4a49a_GH0.tar.gz) = 57ffc42426c887b3ee456bfe45cad52a5ff55fbec0dd5c5693647cc7d2e03212
+SIZE (crooks-cleanfeed-20200402-dd177d4a3b6ea2e538da17bbb2a74772cea4a49a_GH0.tar.gz) = 58634