diff --git a/security/softether5/Makefile b/security/softether5/Makefile
index 1fdc8e44152e..c010711c65e6 100644
--- a/security/softether5/Makefile
+++ b/security/softether5/Makefile
@@ -1,72 +1,78 @@
 PORTNAME=	softether
-DISTVERSION=	5.02.0
-PORTREVISION=	1
+DISTVERSION=	5.02.${SE_BUILD_NUMBER}
 PORTEPOCH=	1
 CATEGORIES=	security net-vpn
 PKGNAMESUFFIX=	5
 DIST_SUBDIR=	${PORTNAME}
 
 # Some patches are managed in my GitHub fork
 PATCH_SITES=	https://github.com/metalefty/${GH_PROJECT}/commit/
 PATCHFILES=	f4baf91.patch:-p1 5890ce9.patch:-p1 ddaffd5.patch:-p1 \
 		57aa471.patch:-p1 5b91032.patch:-p1 7a208d6.patch:-p1 \
 		89ca29f.patch:-p1 b4817fd.patch:-p1 28c90b1.patch:-p1
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	SoftEther VPN 5 (Developer Edition)
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libsodium.so:security/libsodium
 
 USES+=		cmake:noninja compiler:c11 iconv:wchar_t \
 		localbase:ldflags ncurses pkgconfig readline ssl
 USE_RC_SUBR=	softether_bridge softether_client \
 		softether_server softether_trafficserver
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	SoftEtherVPN
 GH_PROJECT=	SoftEtherVPN
-GH_TUPLE=	SoftEtherVPN:libhamcore:b7f5d8d:libhamcore/src/libhamcore \
+GH_TUPLE=	SoftEtherVPN:SoftEtherVPN:5.02.0 \
+		SoftEtherVPN:libhamcore:b7f5d8d:libhamcore/src/libhamcore \
 		BLAKE2:BLAKE2:b52178a:BLAKE2/3rdparty/BLAKE2 \
 		cxong:tinydir:ec6bff2:tinydir/3rdparty/tinydir
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DBUILD_NUMBER=${SE_BUILD_NUMBER} \
 		-DSE_DBDIR="${SE_DBDIR}" \
 		-DSE_LOGDIR="${SE_LOGDIR}" \
 		-DSE_PIDDIR="${SE_PIDDIR}"
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	DISCLAIMER.md WARNING.TXT
 CONFLICTS_INSTALL=	softether-4.[0-9]* softether-devel-4.[0-9]*
 
+# The build number must be a monotonically increasing value but upstream
+# accidentally reset it to zero. So reset to the correct value.
+# See also: SoftEtherVPN/SoftEtherVPN#1392
+SE_BUILD_NUMBER=	9675
 SE_DBDIR?=	/var/db/${PORTNAME}
 SE_LOGDIR?=	/var/log/${PORTNAME}
 SE_PIDDIR?=	/var/run/${PORTNAME}
 PLIST_SUB=	SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" SE_PIDDIR="${SE_PIDDIR}"
 SUB_LIST=	SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" SE_PIDDIR="${SE_PIDDIR}"
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
 # devel/cpu_features not available on these archs, see devel/cpu_features/Makefile
 .if (${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == mips || ${ARCH} == mips64)
 # skip cpu_features when devel/cpu_features is not available
 CMAKE_BOOL_ON+=	SKIP_CPU_FEATURES
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/include/cpu_features_macros.h:devel/cpu_features
+LIB_DEPENDS+=	libcpu_features.so:devel/cpu_features
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${SE_LOGDIR} ${STAGEDIR}${SE_DBDIR} ${STAGEDIR}${SE_PIDDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${FIND} ${WRKSRC} -name ${doc} -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR} \;
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/security/softether5/distinfo b/security/softether5/distinfo
index 11576e4f3f4b..5ab3fe3eb3fa 100644
--- a/security/softether5/distinfo
+++ b/security/softether5/distinfo
@@ -1,27 +1,27 @@
-TIMESTAMP = 1623585157
-SHA256 (softether/SoftEtherVPN-SoftEtherVPN-5.02.0_GH0.tar.gz) = fc410e5ee8cc06511a214d9db083b06422dbe2deb3d6be8b9a38bc6a3dceafa8
-SIZE (softether/SoftEtherVPN-SoftEtherVPN-5.02.0_GH0.tar.gz) = 16471174
+TIMESTAMP = 1624516438
+SHA256 (softether/SoftEtherVPN-SoftEtherVPN-5.02.9675-5.02.0_GH0.tar.gz) = fc410e5ee8cc06511a214d9db083b06422dbe2deb3d6be8b9a38bc6a3dceafa8
+SIZE (softether/SoftEtherVPN-SoftEtherVPN-5.02.9675-5.02.0_GH0.tar.gz) = 16471174
 SHA256 (softether/SoftEtherVPN-libhamcore-b7f5d8d_GH0.tar.gz) = a41b6cbbc3ba562aa70024419b562f8ce502db40fc06c3bef82952133354952d
 SIZE (softether/SoftEtherVPN-libhamcore-b7f5d8d_GH0.tar.gz) = 8333
 SHA256 (softether/BLAKE2-BLAKE2-b52178a_GH0.tar.gz) = 0bef79a164bda953410f474daab3241ed6461daa4fb90213b95ae60c440c6775
 SIZE (softether/BLAKE2-BLAKE2-b52178a_GH0.tar.gz) = 908803
 SHA256 (softether/cxong-tinydir-ec6bff2_GH0.tar.gz) = d9c28aecc6c12409156942c5f6293267f9fba91ab1c2727bcfe26dc8f451030f
 SIZE (softether/cxong-tinydir-ec6bff2_GH0.tar.gz) = 24765
 SHA256 (softether/f4baf91.patch) = d617df9b62ee74e4ae0f0ca83a804c819b52c1108412053a9f8ddd691619ce6e
 SIZE (softether/f4baf91.patch) = 822
 SHA256 (softether/5890ce9.patch) = 9f8f5782192409ece2cc605fa0072afc661dde12f4b63ac13812d87e11fc8689
 SIZE (softether/5890ce9.patch) = 930
 SHA256 (softether/ddaffd5.patch) = 6ec6d035616827162ff7c58959fe491bb352c4f2ef9f24d8d834f66d888306da
 SIZE (softether/ddaffd5.patch) = 2014
 SHA256 (softether/57aa471.patch) = 411aee3dcd57b6d868d83710ac9be81ed0335e142fb649f39ca8e01deb67d489
 SIZE (softether/57aa471.patch) = 1118
 SHA256 (softether/5b91032.patch) = 96e1674b2fed3718b07c5734ebc95eadcf16fd0f92edc44b3cd64929bc75d74e
 SIZE (softether/5b91032.patch) = 5168
 SHA256 (softether/7a208d6.patch) = 4a909eb7bab786d2be4194633cf1eae26dbdfb71274b992cddad790567f6433b
 SIZE (softether/7a208d6.patch) = 2737
 SHA256 (softether/89ca29f.patch) = de5b06e62fb028a6b265bf5fac1c81ce5da9bdba98eac99537ebac6b95e3408a
 SIZE (softether/89ca29f.patch) = 2452
 SHA256 (softether/b4817fd.patch) = f00b1d2931cc8d13d1e55207929a6217f06b00c69059c8f70d207f5f44fe3907
 SIZE (softether/b4817fd.patch) = 3312
 SHA256 (softether/28c90b1.patch) = 83a86836a3b704a10e24bb5f19c77e957b9e6d21e5253ce6318ee6e35f0b4848
 SIZE (softether/28c90b1.patch) = 1100