diff --git a/x11-toolkits/thentenaar-motif-devel/Makefile b/x11-toolkits/thentenaar-motif-devel/Makefile
index e598938f7e80..6ca08961b994 100644
--- a/x11-toolkits/thentenaar-motif-devel/Makefile
+++ b/x11-toolkits/thentenaar-motif-devel/Makefile
@@ -1,59 +1,59 @@
-PORTNAME=	open-motif
+PORTNAME=	thentenaar-motif
 PORTVERSION=	${COMMIT_DATE}
 PORTREVISION=	7
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Motif X11 Toolkit (industry standard GUI (IEEE 1295))
-WWW=		https://motif.ics.com/
+WWW=		https://github.com/thentenaar/motif
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	cschuber
+GH_ACCOUNT=	thentenaar
 GH_PROJECT=	motif
 GH_TAGNAME=	0f556b08
 COMMIT_DATE=	2023.02.16
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	lesstif
-CONFLICTS_INSTALL=	open-motif
+CONFLICTS_INSTALL=	open-motif thentenaar-motif
 
 USES=		autoreconf gmake iconv jpeg libtool:keepla pkgconfig xorg
 USE_XORG=	x11 xaw xbitmaps xext xft xt xmu xrender sm ice
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libXmu.so:x11-toolkits/libXmu
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-printing=no
 CPPFLAGS+=	-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -I${PREFIX}/include
 USE_CSTD=	gnu89
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 # fix sections
 	@${FIND} ${WRKSRC}/doc/man/man1 -name '*.1' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|user cmd|1|'
 	@${FIND} ${WRKSRC}/doc/man/man3 -name '*.3' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|library call|3|'
 # mwmrc is not a kernel interface!!
 	@cd ${WRKSRC}/doc/man && ${CP} -f man4/mwmrc.4 man5/mwmrc.5
 	@${FIND} ${WRKSRC}/doc/man/man5 -name '*.5' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|special file|5| ; \
 		 s|file formats|5|'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in BUGREPORT README RELNOTES
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/thentenaar-motif-devel/distinfo b/x11-toolkits/thentenaar-motif-devel/distinfo
index 3d61f0ccd591..7d3454f10c57 100644
--- a/x11-toolkits/thentenaar-motif-devel/distinfo
+++ b/x11-toolkits/thentenaar-motif-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1681746898
-SHA256 (cschuber-motif-2023.02.16-0f556b08_GH0.tar.gz) = 0a77ee0b43fa4613537333f81cd69aca1355dcee911e04ebf5f3f8f0184dab2e
-SIZE (cschuber-motif-2023.02.16-0f556b08_GH0.tar.gz) = 8865594
+TIMESTAMP = 1767370964
+SHA256 (thentenaar-motif-2023.02.16-0f556b08_GH0.tar.gz) = 0a77ee0b43fa4613537333f81cd69aca1355dcee911e04ebf5f3f8f0184dab2e
+SIZE (thentenaar-motif-2023.02.16-0f556b08_GH0.tar.gz) = 8865594
diff --git a/x11-toolkits/thentenaar-motif/Makefile b/x11-toolkits/thentenaar-motif/Makefile
index 0e423954b230..f6e2d96ac22d 100644
--- a/x11-toolkits/thentenaar-motif/Makefile
+++ b/x11-toolkits/thentenaar-motif/Makefile
@@ -1,55 +1,58 @@
-PORTNAME=	open-motif
-PORTVERSION=	2.3.8
+PORTNAME=	thentenaar-motif
+DISTVERSION=	2.3.8
 PORTREVISION=	8
 CATEGORIES=	x11-toolkits
-# MASTER_SITES=	SF/${PORTNAME}/Motif%202.3.4%20Source%20Code/
-MASTER_SITES=	SF/motif/Motif%20${PORTVERSION}%20Source%20Code/
 DISTNAME=	motif-${PORTVERSION}
+DISTVERSIONPREFIX=	v
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Motif X11 Toolkit (industry standard GUI (IEEE 1295))
-WWW=		https://motif.ics.com/
+WWW=		https://github.com/thentenaar/motif
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	thentenaar
+GH_PROJECT=	motif
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	lesstif
-CONFLICTS_INSTALL=	open-motif-devel
+CONFLICTS_INSTALL=	open-motif-devel thentenaar-motif-devel
 
 USES=		autoreconf gmake iconv jpeg libtool:keepla pkgconfig xorg
 USE_XORG=	x11 xaw xbitmaps xext xft xt xmu xrender sm ice
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libXmu.so:x11-toolkits/libXmu
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-printing=no
 CPPFLAGS+=	-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -I${PREFIX}/include
 USE_CSTD=	gnu89
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 # fix sections
 	@${FIND} ${WRKSRC}/doc/man/man1 -name '*.1' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|user cmd|1|'
 	@${FIND} ${WRKSRC}/doc/man/man3 -name '*.3' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|library call|3|'
 # mwmrc is not a kernel interface!!
 	@cd ${WRKSRC}/doc/man && ${CP} -f man4/mwmrc.4 man5/mwmrc.5
 	@${FIND} ${WRKSRC}/doc/man/man5 -name '*.5' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|special file|5| ; \
 		 s|file formats|5|'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in BUGREPORT README RELNOTES
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/thentenaar-motif/distinfo b/x11-toolkits/thentenaar-motif/distinfo
index e67f3f05afab..795b1e81bb24 100644
--- a/x11-toolkits/thentenaar-motif/distinfo
+++ b/x11-toolkits/thentenaar-motif/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512568346
-SHA256 (motif-2.3.8.tar.gz) = 859b723666eeac7df018209d66045c9853b50b4218cecadb794e2359619ebce7
-SIZE (motif-2.3.8.tar.gz) = 5704328
+TIMESTAMP = 1767370825
+SHA256 (thentenaar-motif-v2.3.8_GH0.tar.gz) = 993264d07d381da2eacaedecb645d2fb98ea28919649121cfaaa2015769d1272
+SIZE (thentenaar-motif-v2.3.8_GH0.tar.gz) = 8861148