diff --git a/misc/heyu2/Makefile b/misc/heyu2/Makefile
index ce9cf23d6c31..2f05c9ba989d 100644
--- a/misc/heyu2/Makefile
+++ b/misc/heyu2/Makefile
@@ -1,85 +1,88 @@
 PORTNAME=	heyu2
-PORTVERSION=	2.10
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.10.3
 CATEGORIES=	misc
-MASTER_SITES=	http://www.heyu.org/download/
-DISTNAME=	heyu-${PORTVERSION}
+#DISTNAME=	heyu-${PORTVERSION}
 
-MAINTAINER=	mstowe@chicago.us.mensa.org
+MAINTAINER=	mstowe@baddomain.com
 COMMENT=	Control a CM11A interface from the command line
 WWW=		https://www.heyu.org/
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: newsb
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: newsb
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	HeyuX10Automation
+GH_PROJECT=	heyu
 
 CONFLICTS=	heyu
 
 ALL_TARGET=	all
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	freebsd
 
 OPTIONS_DEFINE=	CM17A EXTENDED RFXSENS RFXMETER DMX OREGON EXAMPLES
 CM17A_DESC=	X10 CM17A "Firecracker" Support
 EXTENDED_DESC=	Extended Type 0 (Shutter/Shade) Support
 RFXSENS_DESC=	RFXSensors (RF) Support
 RFXMETER_DESC=	RFXMeter (RF) Support
 DMX_DESC=	Digimax Thermostat Support
 OREGON_DESC=	Oregon Support
 
 OPTIONS_DEFAULT=	CM17A EXTENDED RFXSENS RFXMETER DMX OREGON
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MCM17A}
 CONFIGURE_ARGS+=	nocm17a
 .endif
 
 .if ! ${PORT_OPTIONS:MEXTENDED}
 CONFIGURE_ARGS+=	noext0
 .endif
 
 .if ! ${PORT_OPTIONS:MRFXSENS}
 CONFIGURE_ARGS+=	norfxs
 .endif
 
 .if ! ${PORT_OPTIONS:MRFXMETER}
 CONFIGURE_ARGS+=	norfxm
 .endif
 
 .if ! ${PORT_OPTIONS:MDMX}
 CONFIGURE_ARGS+=	nodmx
 .endif
 
 .if ! ${PORT_OPTIONS:MOREGON}
 CONFIGURE_ARGS+=	noore
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E 's|/usr/local|${PREFIX}|g; \
 			     s,(CC) =,\1 ?=,g; \
 			     s,(CFLAGS) =,\1 +=,g' \
 		${WRKSRC}/Configure
 	@${REINPLACE_CMD} -e 's|<.*termio[s]*.h|<sys/ttycom.h|g' \
 		${WRKSRC}/cm17a.c \
 		${WRKSRC}/xsync.c \
 		${WRKSRC}/xwrite.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/heyu ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/heyu.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/x10aux.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/x10config.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/x10cm17a.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/x10digimax.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/x10oregon.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/x10sched.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/x10scripts.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/x10rfxmeters.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/x10rfxsensors.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/x10config.sample ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/x10.sched.sample ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/heyu2/distinfo b/misc/heyu2/distinfo
index 17d37ef05bf3..6a868feba703 100644
--- a/misc/heyu2/distinfo
+++ b/misc/heyu2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (heyu-2.10.tar.gz) = ac8127fb412ce1bdb88e70960aba6d33617092af6579e95abde33993040d7feb
-SIZE (heyu-2.10.tar.gz) = 594969
+TIMESTAMP = 1681622457
+SHA256 (HeyuX10Automation-heyu-v2.10.3_GH0.tar.gz) = 0c3435ea9cd57cd78c29047b9c961f4bfbec39f42055c9949acd10dd9853b628
+SIZE (HeyuX10Automation-heyu-v2.10.3_GH0.tar.gz) = 600491