diff --git a/mail/getmail6/Makefile b/mail/getmail6/Makefile
index b6c32e237e79..149887f5e5b6 100644
--- a/mail/getmail6/Makefile
+++ b/mail/getmail6/Makefile
@@ -1,34 +1,36 @@
 PORTNAME=	getmail6
 DISTVERSIONPREFIX=	v
-DISTVERSION=	6.18
+DISTVERSION=	6.18-1
+DISTVERSIONSUFFIX=	-g9d15886
 CATEGORIES=	mail python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	freebsd@michael-bueker.de
 COMMENT=	POP3/IMAP4 mail retriever (Python3 fork)
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
-USES=		python:3.6+
+USES=		python:3.6+ shebangfix
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist concurrent distutils
+SHEBANG_FILES=	getmail getmail-gmail-xoauth-tokens getmail_*
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PORTDOCS=	*.css *.html *.txt BUGS CHANGELOG README THANKS
 PORTEXAMPLES=	getmailrc-examples
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install-DOCS-on:
 	@${CP} ${WRKSRC}/README ${WRKSRC}/docs/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/getmailrc-examples ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/getmail6/distinfo b/mail/getmail6/distinfo
index 96487c165705..0152f76e4115 100644
--- a/mail/getmail6/distinfo
+++ b/mail/getmail6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625570539
-SHA256 (getmail6-getmail6-v6.18_GH0.tar.gz) = 928053ae0d7ae5666baa4a81c3428f25a7059296584eb0ce504ab1b4aba06897
-SIZE (getmail6-getmail6-v6.18_GH0.tar.gz) = 197774
+TIMESTAMP = 1625590688
+SHA256 (getmail6-getmail6-v6.18-1-g9d15886_GH0.tar.gz) = 45df957147252074de089e19f3871ae24b57083aea2e04fa8a630e420cac18b2
+SIZE (getmail6-getmail6-v6.18-1-g9d15886_GH0.tar.gz) = 197858