diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index e23fc26962f6..58fb39254c93 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -1,35 +1,41 @@
 # Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 
 PORTNAME=	xkbset
 PORTVERSION=	0.6
+DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://faculty.missouri.edu/~stephen/software/xkbset/
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Manage various XKB features of X Window
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	stephenmontgomerysmith
 
 USES=		perl5 xorg
 USE_XORG=	x11
 USE_PERL5=	build
 
 MAKE_ARGS=	X11BASE="${LOCALBASE}" X11PREFIX="${PREFIX}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
 OPTIONS_DEFINE=	GUI
 GUI_DESC=	Install Tk GUI
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGUI}
 RUN_DEPENDS+=	p5-Tk>=0:x11-toolkits/p5-Tk
 PLIST_SUB+=	GUI=""
 MAKE_ARGS+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 .else
 PLIST_SUB+=	GUI="@comment "
 MAKE_ARGS+=	INSTALL_SCRIPT=:
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/xkbset/distinfo b/x11/xkbset/distinfo
index 36aed5cce67f..0c2ccd5bda5b 100644
--- a/x11/xkbset/distinfo
+++ b/x11/xkbset/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609362057
-SHA256 (xkbset-0.6.tar.gz) = ac032fec49c4c4f0f2318d3f4618970c514191b142e06c51a661fe2342a535a5
-SIZE (xkbset-0.6.tar.gz) = 14141
+TIMESTAMP = 1631333467
+SHA256 (stephenmontgomerysmith-xkbset-v0.6_GH0.tar.gz) = 2327be2e87736e2c5557fe8abd827396a47e6ead36014828b4b7717632d00468
+SIZE (stephenmontgomerysmith-xkbset-v0.6_GH0.tar.gz) = 13838