diff --git a/misc/hxtools/Makefile b/misc/hxtools/Makefile
index cbb097968c5d..2c333335c55d 100644
--- a/misc/hxtools/Makefile
+++ b/misc/hxtools/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	hxtools
-PORTVERSION=	20230411
+PORTVERSION=	20231101
 CATEGORIES=	misc
-MASTER_SITES=	http://inai.de/files/hxtools/
+MASTER_SITES=	http://inai.de/files/hxtools/ \
+		https://codeberg.org/jengelh/hxtools/releases/download/rel-${PORTVERSION}/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Collection of miscellaneous tools and scripts
 WWW=		https://inai.de/projects/hxtools/
 
 LIB_DEPENDS=	libHX.so:lang/libhx libpci.so:devel/libpci
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lang iconv perl5 pkgconfig shebangfix \
 		tar:zst xorg
 GNU_CONFIGURE=	yes
 SHEBANG_FILES=	data/hxtools_bashrc.bash data/hxtools_profile.bash \
 		examples/git-deconstruct examples/rc4 sadmin/hxnetload \
 		sadmin/ldif-duplicate-attrs sadmin/ldif-leading-spaces \
 		sadmin/logontime sadmin/pmap_dirty sadmin/recursive_lower \
 		sadmin/vcsaview sdevel/cwdiff \
 		sdevel/diff2php sdevel/doxygen-kerneldoc-filter \
 		sdevel/git-author-stat sdevel/git-blame-stats \
 		sdevel/git-forest sdevel/git-revert-stats \
 		sdevel/git-track sdevel/man2html sdevel/paddrspacesize \
 		sdevel/proc_stat_signal_decode sdevel/sourcefuncsize \
 		sdevel/spec-beautifier smm/aumeta smm/extract_d3pkg \
 		smm/extract_dfqshared.pm smm/extract_dxhog \
 		smm/extract_f3pod smm/extract_qupak smm/gpsh smm/mkvappend \
 		smm/mod2opus smm/ssa2srt suser/fxterm suser/mailsplit \
 		suser/pegrep suser/pesubst suser/qpdecode suser/qtar \
 		suser/rezip suser/wktimer
 USE_PERL5=	run
 USE_XORG=	xcb
 
 CONFLICTS_INSTALL=	grx psptoolchain-pspsdk-stage2 # bin/bin2c
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e '/COMPAT_PROC/s,/compat/linux,${LINUXBASE},' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -E '/COMPAT_PROC ?=/s,"","${LINUXBASE}",' \
 		${WRKSRC}/sadmin/hxnetload \
 		${WRKSRC}/sadmin/pmap_dirty \
 		${WRKSRC}/sdevel/paddrspacesize
 	@${REINPLACE_CMD} -E 's,(/usr)?/bin,${LOCALBASE}/bin,g' \
 		${WRKSRC}/sadmin/su1
 	@${REINPLACE_CMD} -e '/checkbrack \\/d' ${WRKSRC}/sdevel/Makefile.in
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/changelog.rst ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/hxtools/distinfo b/misc/hxtools/distinfo
index 33b6c8dcae80..eeaf7282a932 100644
--- a/misc/hxtools/distinfo
+++ b/misc/hxtools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1681210008
-SHA256 (hxtools-20230411.tar.zst) = 15266562661b339e054ab1e4f1830bd1ae43faf151401075e3b7d1fc788a10f7
-SIZE (hxtools-20230411.tar.zst) = 203185
+TIMESTAMP = 1698834182
+SHA256 (hxtools-20231101.tar.zst) = bf290bc023fcd52d86cb611e9b75fcec1aa48165e123484a85ee8442e2e19803
+SIZE (hxtools-20231101.tar.zst) = 201612
diff --git a/misc/hxtools/files/patch-sadmin_utmp__register.c b/misc/hxtools/files/patch-sadmin_utmp__register.c
deleted file mode 100644
index 69f0ca9dfee2..000000000000
--- a/misc/hxtools/files/patch-sadmin_utmp__register.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- sadmin/utmp_register.c.orig	2020-07-12 09:44:16 UTC
-+++ sadmin/utmp_register.c
-@@ -71,8 +71,10 @@ static bool get_options(int *argc, const char ***argv)
- 		 .help = "Perform operation on lastlog"},
- 		{.sh = 'U', .type = HXTYPE_NONE, .ptr = &Opt.op_utmp,
- 		 .help = "Perform operation on UTMP"},
-+#if 0
- 		{.sh = 'W', .type = HXTYPE_NONE, .ptr = &Opt.op_wtmp,
- 		 .help = "Perform operation on WTMP"},
-+#endif
- 		{.sh = 'e', .type = HXTYPE_NONE, .ptr = &Opt.epid,
- 		 .help = "Encode PID into ut_id"},
- 		{.sh = 'h', .type = HXTYPE_STRING, .ptr = &Opt.host,
-@@ -87,8 +89,10 @@ static bool get_options(int *argc, const char ***argv)
- 		 .help = "Unique ID 2", .htyp = "sess"},
- 		{.sh = 'u', .type = HXTYPE_STRING, .ptr = &Opt.futmp,
- 		 .help = "Path to utmp"},
-+#if 0
- 		{.sh = 'w', .type = HXTYPE_STRING, .ptr = &Opt.fwtmp,
- 		 .help = "Path to wtmp"},
-+#endif
- 		HXOPT_AUTOHELP,
- 		HXOPT_TABLEEND,
- 	};
diff --git a/misc/hxtools/pkg-plist b/misc/hxtools/pkg-plist
index c0b0f84c441f..dad7c1b3b4b4 100644
--- a/misc/hxtools/pkg-plist
+++ b/misc/hxtools/pkg-plist
@@ -1,126 +1,124 @@
 bin/aumeta
 bin/bin2c
 bin/bsvplay
 bin/checkbrack
 bin/cwdiff
 bin/declone
 bin/extract_d3pkg
 bin/extract_dfqshared.pm
 bin/extract_dxhog
 bin/extract_f3pod
 bin/extract_qupak
 bin/fxterm
 bin/git-author-stat
 bin/git-blame-stats
 bin/git-forest
 bin/git-revert-stats
 bin/git-track
 bin/gpsh
 bin/gxxdm
 bin/hcdplay
 bin/man2html
 bin/mkvappend
 bin/mod2opus
 bin/ofl
 bin/pcmdiff
 bin/pcmmix
 bin/pegrep
 bin/pesubst
 bin/pmap_dirty
 bin/proc_iomem_count
 bin/proc_stat_parse
 bin/qpdecode
 bin/qplay
 bin/qtar
 bin/rot13
 bin/spec-beautifier
 bin/ssa2srt
 bin/su1
 bin/sysinfo
 bin/tailhex
 bin/wktimer
 bin/xcp
 etc/hxloginpref.conf
 libexec/hxtools/clock_info
 libexec/hxtools/diff2php
 libexec/hxtools/doxygen-kerneldoc-filter
 libexec/hxtools/fd0ssh
 libexec/hxtools/hxnetload
 libexec/hxtools/ldif-duplicate-attrs
 libexec/hxtools/ldif-leading-spaces
 libexec/hxtools/logontime
 libexec/hxtools/mailsplit
 libexec/hxtools/paddrspacesize
 libexec/hxtools/peicon
 libexec/hxtools/proc_stat_signal_decode
 libexec/hxtools/psthreads
 libexec/hxtools/recursive_lower
 libexec/hxtools/rezip
 libexec/hxtools/sourcefuncsize
-libexec/hxtools/utmp_register
 libexec/hxtools/vcsaview
 man/man1/aumeta.1.gz
 man/man1/bin2c.1.gz
 man/man1/bsvplay.1.gz
 man/man1/checkbrack.1.gz
 man/man1/clock_info.1.gz
 man/man1/cwdiff.1.gz
 man/man1/declone.1.gz
 man/man1/diff2php.1.gz
 man/man1/extract_d3pkg.1.gz
 man/man1/extract_dxhog.1.gz
 man/man1/extract_f3pod.1.gz
 man/man1/extract_qupak.1.gz
 man/man1/fd0ssh.1.gz
 man/man1/fxterm.1.gz
 man/man1/git-author-stat.1.gz
 man/man1/git-forest.1.gz
 man/man1/git-revert-stats.1.gz
 man/man1/git-track.1.gz
 man/man1/hcdplay.1.gz
 man/man1/ldif-duplicate-attrs.1.gz
 man/man1/mailsplit.1.gz
 man/man1/man2html.1.gz
 man/man1/mod2opus.1.gz
 man/man1/ofl.1.gz
 man/man1/pcmdiff.1.gz
 man/man1/pcmmix.1.gz
 man/man1/pegrep.1.gz
 man/man1/peicon.1.gz
 man/man1/pesubst.1.gz
 man/man1/psthreads.1.gz
 man/man1/qplay.1.gz
 man/man1/qtar.1.gz
 man/man1/recursive_lower.1.gz
 man/man1/rezip.1.gz
 man/man1/rot13.1.gz
 man/man1/sourcefuncsize.1.gz
 man/man1/spec-beautifier.1.gz
 man/man1/ssa2srt.1.gz
 man/man1/sysinfo.1.gz
 man/man1/tailhex.1.gz
 man/man1/wktimer.1.gz
 man/man1/xcp.1.gz
 man/man7/hxtools.7.gz
 man/man8/hxnetload.8.gz
 man/man8/logontime.8.gz
-man/man8/utmp_register.8.gz
 man/man8/vcsaview.8.gz
 man/man8/xfs_irecover.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/changelog.rst
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/git-deconstruct
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc4
 %%DATADIR%%/gitconfig
 %%DATADIR%%/hxloginpref.conf
 %%DATADIR%%/hxtools_bashrc.bash
 %%DATADIR%%/hxtools_dircolors
 %%DATADIR%%/hxtools_profile.bash
 %%DATADIR%%/rfc2307bis-utf8.schema
 share/kbd/consolefonts/A1.fnt
 share/kbd/consolefonts/B1.fnt
 share/kbd/consolefonts/E1.fnt
 share/kbd/consolefonts/neuropol.fnt
 share/kbd/keymaps/i386/qwerty/us_jng.map
 share/kbd/keymaps/i386/qwerty/us_jng_vaiou3.map
 share/kbd/keymaps/i386/qwertz/de_jng.map
 share/kbd/unimaps/cp437AB.uni