diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 5b9ec2c6aefe..3320d97bfade 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -1,41 +1,39 @@
 PORTNAME=	xiphos
-DISTVERSION=	4.3.1
-PORTREVISION=	2
+DISTVERSION=	4.3.2
 CATEGORIES=	misc gnome
-# Don't use USE_GITHUB: the sources downloaded by USE_GITHUB cannot be
-# built as they miss the file ${WRKSRC}/cmake/source_version.txt.
-# See also: https://github.com/crosswire/xiphos/issues/1037
-MASTER_SITES=	https://github.com/crosswire/${PORTNAME}/archive/refs/tags/${DISTVERSION}/
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Bible interface utilizing the sword framework
 WWW=		https://xiphos.org
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	appstream-util:devel/appstream-glib \
 		desktop-file-validate:devel/desktop-file-utils \
 		itstool:textproc/itstool \
 		yelp-build:textproc/yelp-tools
 LIB_DEPENDS=	libbiblesync.so:misc/biblesync \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libenchant.so:textproc/enchant \
 		libicui18n.so:devel/icu \
 		libsoup-2.4.so:devel/libsoup \
 		libsword.so:misc/sword \
 		libuuid.so:misc/libuuid \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk@40
 
 # gettext is always needed, even if NLS is off
 USES=		cmake compiler:c11 gettext gnome minizip pkgconfig
 USE_GNOME=	cairo gtk30 gtkhtml4 intltool libgsf
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	crosswire
+
 CMAKE_OFF=	EPUB
 CMAKE_ON=	GTKHTML
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	NLS
 
 .include <bsd.port.mk>
diff --git a/misc/xiphos/distinfo b/misc/xiphos/distinfo
index 6d3ce7035203..09be57acb74b 100644
--- a/misc/xiphos/distinfo
+++ b/misc/xiphos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744015352
-SHA256 (xiphos-4.3.1.tar.gz) = 6ff5f94b50b5fc4c0018a19886fb246e4589400a3d49826cdbebc66c917b8d54
-SIZE (xiphos-4.3.1.tar.gz) = 28298675
+TIMESTAMP = 1758592696
+SHA256 (crosswire-xiphos-4.3.2_GH0.tar.gz) = 9d90678657aa1cf34a5101aa56bcdbdfdb586609d8a43004b872ca80988f5f35
+SIZE (crosswire-xiphos-4.3.2_GH0.tar.gz) = 28298701
diff --git a/misc/xiphos/files/patch-help_CMakeLists.txt b/misc/xiphos/files/patch-help_CMakeLists.txt
new file mode 100644
index 000000000000..c10faa5d4134
--- /dev/null
+++ b/misc/xiphos/files/patch-help_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- help/CMakeLists.txt.orig	2025-09-23 01:54:08 UTC
++++ help/CMakeLists.txt
+@@ -170,8 +170,8 @@ if (HELP)
+   set (mallard-schema ${CMAKE_CURRENT_SOURCE_DIR}/xml/mallard-1.0.rng)
+   foreach (lang ${help_all_langs})
+     add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${lang}/validate.txt
+-#      COMMAND ${XMLLINT} --noout --xinclude --noent --relaxng ${mallard-schema} *.page > ${CMAKE_CURRENT_BINARY_DIR}/${lang}/validate.txt 2>&1
+-      COMMAND ${XMLLINT} --noout --xinclude --noent --relaxng ${mallard-schema} *.page
++#      COMMAND ${XMLLINT} --noout --xinclude --noent ${mallard-schema} *.page > ${CMAKE_CURRENT_BINARY_DIR}/${lang}/validate.txt 2>&1
++      COMMAND ${XMLLINT} --noout --xinclude --noent ${mallard-schema} *.page
+       DEPENDS help-${lang}-pages
+       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${lang}
+       COMMENT "'${lang}' help - mallard pages validation report"