diff --git a/ports-mgmt/portscout/Makefile b/ports-mgmt/portscout/Makefile
index 20f653e34cd4..2718264496c3 100644
--- a/ports-mgmt/portscout/Makefile
+++ b/ports-mgmt/portscout/Makefile
@@ -1,114 +1,110 @@
 PORTNAME=	portscout
 PORTVERSION=	0.8.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	e618f1b.patch:-p1 # https://github.com/freebsd/portscout/pull/22
-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tool to scan for new versions of FreeBSD ports
 WWW=		https://www.inerd.com/software/portscout/
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 		p5-CGI>=0:www/p5-CGI \
 		p5-Proc-Queue>=0:devel/p5-Proc-Queue \
 		p5-URI>=0:net/p5-URI \
 		p5-XML-XPath>=0:textproc/p5-XML-XPath \
 		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
 		p5-libwww>=0:www/p5-libwww \
 		p5-JSON>0:converters/p5-JSON
 
 USES=		perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
+GH_TAGNAME=	f1a90b0
 
-OPTIONS_DEFINE=		DOCS HTTPS
-OPTIONS_DEFAULT=	HTTPS PGSQL
-
-OPTIONS_MULTI=		DATABASE
-OPTIONS_MULTI_DATABASE=	SQLITE PGSQL
-
-DATABASE_DESC=	Database Backends
+SHEBANG_FILES=	${WRKSRC}/portscout.pl
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-SHEBANG_FILES=	${WRKSRC}/portscout.pl
 
 PORTDOCS=	UPDATING portscout-portconfig.txt xml-datasrc-example.xml
 
-HTTPS_RUN_DEPENDS=	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https
+OPTIONS_DEFINE=		DOCS HTTPS
+OPTIONS_DEFAULT=	HTTPS PGSQL
+OPTIONS_MULTI=		DATABASE
+OPTIONS_MULTI_DATABASE=	SQLITE PGSQL
 
-SQLITE_USES=		sqlite
-SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
+DATABASE_DESC=	Database Backends
 
-PGSQL_USES=		pgsql
+HTTPS_RUN_DEPENDS=	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https
 PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
+PGSQL_USES=		pgsql
+SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
+SQLITE_USES=		sqlite
 
 .include <bsd.port.options.mk>
 
 pre-everything::
 .if ${PORT_OPTIONS:MSQLITE}
 	@${ECHO_MSG} "+-------------------------------------------------------------+"
 	@${ECHO_MSG} "| Warning! although SQLite is supported, portscout will only  |"
 	@${ECHO_MSG} "| operate in non-forking mode with this database backend. It  |"
 	@${ECHO_MSG} "| is therefore recommended only for use with light workloads. |"
 	@${ECHO_MSG} "+-------------------------------------------------------------+"
 .endif
 
 pre-install:
 	@${REINPLACE_CMD} -e "s#^\(templates .*\)/etc#\1/share#"	\
 	                  -e "s#^prefix\( *= *\).*#prefix\1${PREFIX}#"	\
 	                  ${WRKSRC}/portscout.conf
 	@${REINPLACE_CMD} -e "s#^\(.*PREFIX.*=> *\)'.*'#\1'${PREFIX}'#"	\
 	                  ${WRKSRC}/Portscout/Const.pm
 	@${MV} ${WRKSRC}/docs/*.* ${WRKSRC}
 
 pre-install-SQLITE-on:
 	@${REINPLACE_CMD} 's/^\([^#]*DBI:Pg.*\)$$/#\1/g' ${WRKSRC}/portscout.conf
 	@${REINPLACE_CMD} 's/^#\(.*DBI:SQLite.*\)$$/\1/g' ${WRKSRC}/portscout.conf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/DataSrc
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SiteHandler
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SQL
 	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/
 	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/DataSrc/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/DataSrc/
 	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/SiteHandler/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SiteHandler/
 	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/SQL/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SQL/
 	${INSTALL_SCRIPT} ${WRKSRC}/Portscout.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout.pm
 	${INSTALL_SCRIPT} ${WRKSRC}/portscout.pl ${STAGEDIR}${PREFIX}/bin/portscout
 
 	${INSTALL_DATA} ${WRKSRC}/portscout.pod ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 
 	pod2man ${WRKSRC}/portscout.pod ${WRKSRC}/portscout.1
 	${INSTALL_MAN} ${WRKSRC}/portscout.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}/templates
 	cd ${WRKSRC}/templates \
 	  && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/templates
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}/sql
 	cd ${WRKSRC}/sql && ${INSTALL_DATA} *.sql ${STAGEDIR}${DATADIR}/sql
 
 	${INSTALL_DATA} ${WRKSRC}/portscout.conf ${STAGEDIR}${PREFIX}/etc/portscout.conf.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .	for f in ${PORTDOCS}
 		${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .	endfor
 
 test:
 	${PERL} ${WRKSRC}/t/00-use.t
 	${PERL} ${WRKSRC}/t/01-vercompare.t
 .if ${PORT_OPTIONS:MSQLITE}
 	${PERL} ${WRKSRC}/t/10-sqlite.t
 #.else
 #	${PERL} ${WRKSRC}/10-postgresql.t
 .endif
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portscout/distinfo b/ports-mgmt/portscout/distinfo
index 438db5cfdc68..a8839277b073 100644
--- a/ports-mgmt/portscout/distinfo
+++ b/ports-mgmt/portscout/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1684733794
-SHA256 (freebsd-portscout-0.8.1.6_GH0.tar.gz) = 419a00fef01492f21c71736b3e8bae8e92377caf218dea2e219d63e09aa9145c
-SIZE (freebsd-portscout-0.8.1.6_GH0.tar.gz) = 58607
-SHA256 (e618f1b.patch) = c0473b3b54eb41c9981e945475bdcd8283af8a187930757e11e9e3d4077a6e8e
-SIZE (e618f1b.patch) = 2304
+TIMESTAMP = 1699815045
+SHA256 (freebsd-portscout-0.8.1.6-f1a90b0_GH0.tar.gz) = 64184c88826dbfcfefa627db8cb2e126468c6b43d4ae50e398dbd3b5c257493e
+SIZE (freebsd-portscout-0.8.1.6-f1a90b0_GH0.tar.gz) = 58755