diff --git a/mail/p5-FuzzyOcr-devel/Makefile b/mail/p5-FuzzyOcr-devel/Makefile
index b084eaf7fd44..923f7acdd6db 100644
--- a/mail/p5-FuzzyOcr-devel/Makefile
+++ b/mail/p5-FuzzyOcr-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	FuzzyOcr
 DISTVERSION=	3.6.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://users.own-hero.net/~decoder/${PORTNAME:tl}/
 PKGNAMEPREFIX=	p5-
@@ -11,7 +11,8 @@ MAINTAINER=	ismail.yenigul@endersys.com.tr
 COMMENT=	Plugin for SpamAssassin which scans image attachments for spam
 WWW=		https://fuzzyocr.own-hero.net/
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	giftopnm:graphics/netpbm			\
 		gifsicle:graphics/gifsicle			\
@@ -34,24 +35,31 @@ PORTDOCS_F=	samples/README samples/ocr-animated.eml			\
 		samples/ocr-obfuscated.eml samples/ocr-png.eml samples/ocr-wrongext.eml
 PORTEXAMPLES=	*
 
-SUB_FILES=	pkg-message
+SUB_FILES=	pkg-message gifinter
 
 SA_PLUGINDIR?=	Mail/SpamAssassin/Plugin
 SA_CONFIGDIR?=	etc/mail/spamassassin
 
-PLIST_FILES=	%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr.pm		\
-		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Config.pm \
-		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Deanimate.pm \
-		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Hashing.pm \
-		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Logging.pm \
-		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Misc.pm \
-		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Preprocessor.pm \
-		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Scanset.pm \
-		%%SITE_PERL%%/${SA_PLUGINDIR}/FuzzyOcr/Scoring.pm
+PLIST_FILES=	${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr.pm		\
+		${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr/Config.pm \
+		${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr/Deanimate.pm \
+		${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr/Hashing.pm \
+		${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr/Logging.pm \
+		${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr/Misc.pm \
+		${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr/Preprocessor.pm \
+		${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr/Scanset.pm \
+		${SITE_PERL}/${SA_PLUGINDIR}/FuzzyOcr/Scoring.pm \
+		bin/gifinter
 
-#.if defined(WITH_OCRAD)
-#RUN_DEPENDS+=	ocrad:graphics/ocrad
-#.endif
+OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_SINGLE=	GIFINTER_EMULATION
+OPTIONS_SINGLE_GIFINTER_EMULATION=IMAGEMAGICK GRAPHICSMAGICK
+OPTIONS_DEFAULT=IMAGEMAGICK
+OPTIONS_SUB=	please
+IMAGEMAGICK_DESC=	Use ImageMagick's convert to process interlaced GIFs
+GRAPHICSMAGICK_DESC=	Use GraphicsMagick to process interlaced GIFs
+IMAGEMAGICK_RUN_DEPENDS=	convert:graphics/ImageMagick7
+GRAPHICSMAGICK_RUN_DEPENDS=	gm:graphics/GraphicsMagick
 
 pre-everything::
 	@${ECHO_MSG} "+---------------------------------------------------+"
@@ -78,6 +86,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.scansets ${STAGEDIR}${EXAMPLESDIR}/FuzzyOcr.scansets
 	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.preps ${STAGEDIR}${EXAMPLESDIR}/FuzzyOcr.preps
 	${INSTALL_DATA} ${WRKSRC}/FuzzyOcr.mysql ${STAGEDIR}${EXAMPLESDIR}/FuzzyOcr.mysql
+	${INSTALL_SCRIPT} ${WRKDIR}/gifinter ${STAGEDIR}${PREFIX}/bin/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/samples
 .for f in ${PORTDOCS_F}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f}
diff --git a/mail/p5-FuzzyOcr-devel/files/gifinter.in b/mail/p5-FuzzyOcr-devel/files/gifinter.in
new file mode 100644
index 000000000000..6a452fc763c7
--- /dev/null
+++ b/mail/p5-FuzzyOcr-devel/files/gifinter.in
@@ -0,0 +1,3 @@
+exec \
+%%IMAGEMAGICK%%%%PREFIX%%/bin/convert -interlace "$@"
+%%GRAPHICSMAGICK%%%%PREFIX%%/bin/gm convert -interlace "$@"