diff --git a/www/mod_auth_gssapi/Makefile b/www/mod_auth_gssapi/Makefile
index 7b6b265242c1..1c195913fbd0 100644
--- a/www/mod_auth_gssapi/Makefile
+++ b/www/mod_auth_gssapi/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	mod_auth_gssapi
-PORTVERSION=	1.6.3
+PORTVERSION=	1.6.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	chris@chrullrich.net
 COMMENT=	Apache module for authenticating users with GSSAPI
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf apache:2.4+ bison gssapi:mit,flags libtool ssl
 USES+=		pkgconfig
 USE_GITHUB=	yes
-GH_ACCOUNT=	modauthgssapi
+GH_ACCOUNT=	gssapi
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	KRB5_CONFIG=${KRB5CONFIG}
 CONFIGURE_ARGS+=	OPENSSL_CFLAGS=-I${OPENSSLINC}
 CONFIGURE_ARGS+=	OPENSSL_LIBS=-lcrypto
 
-PLIST_FILES=	@sample\ ${APACHEETCDIR}/modules.d/%%APMOD_FILE%% \
+PLIST_FILES=	@sample\ ${APACHEETCDIR}/modules.d/${APMOD_FILE} \
 		${APACHEMODDIR}/mod_auth_gssapi.so
 
 SUB_FILES=	${APMOD_FILE}
 APMOD_FILE=	240_${PORTNAME}.conf.sample
 PLIST_SUB+=	APMOD_FILE=${APMOD_FILE}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
 		-i -n ${MODULENAME} ${WRKSRC}/src/${MODULENAME}.la
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 
 .include <bsd.port.mk>
diff --git a/www/mod_auth_gssapi/distinfo b/www/mod_auth_gssapi/distinfo
index 6a5c7d4b4f67..37edee86c32d 100644
--- a/www/mod_auth_gssapi/distinfo
+++ b/www/mod_auth_gssapi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596911982
-SHA256 (modauthgssapi-mod_auth_gssapi-v1.6.3_GH0.tar.gz) = 6172cf77a8531c7cdef93a2c66a95f70c06115a2a0d55c359e9bfc783c87af60
-SIZE (modauthgssapi-mod_auth_gssapi-v1.6.3_GH0.tar.gz) = 121840
+TIMESTAMP = 1661791300
+SHA256 (gssapi-mod_auth_gssapi-v1.6.5_GH0.tar.gz) = 8c61c04062d3fffadfad8e71e65783d8e5dffe806be76e8c9a097500a59a76eb
+SIZE (gssapi-mod_auth_gssapi-v1.6.5_GH0.tar.gz) = 123448
diff --git a/www/mod_auth_gssapi/pkg-descr b/www/mod_auth_gssapi/pkg-descr
index b65ed0a735aa..54e265d6b409 100644
--- a/www/mod_auth_gssapi/pkg-descr
+++ b/www/mod_auth_gssapi/pkg-descr
@@ -1,4 +1,4 @@
 This module adds support for single-sign-on authentication via GSSAPI
 to the Apache httpd. It is intended as a successor to mod_auth_kerb.
 
-WWW: https://github.com/modauthgssapi/mod_auth_gssapi
+WWW: https://github.com/gssapi/mod_auth_gssapi