diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index cf60bdf74200..791b2c4e16b2 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	mosh
 PORTVERSION=	1.4.0
 DISTVERSIONPREFIX=	${PORTNAME}-
 PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Mobile terminal that supports intermittent connectivity
 WWW=		https://mosh.org/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USES=		autoreconf compiler:c++17-lang ncurses perl5 pkgconfig ssl
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-utempter --without-ncurses
 CONFIGURE_ENV+=	OpenSSL_CFLAGS="-I${OPENSSLINC}" OpenSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
-		TINFO_CFLAGS="-I/usr/include" ac_cv_have_decl_bswap64=yes
+		TINFO_CFLAGS="-I/usr/include" ac_cv_have_decl_bswap64=yes \
+		ac_cv_have_decl___builtin_bswap64=yes
 INSTALL_TARGET=	install-strip
 USE_CXXSTD=	c++17
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mobile-shell
 
 CONFLICTS_INSTALL=	mosh-0.[2-9].*
 
 PLIST_FILES=	bin/mosh bin/mosh-server bin/mosh-client \
 		man/man1/mosh-client.1.gz man/man1/mosh-server.1.gz man/man1/mosh.1.gz
 
 .include <bsd.port.mk>
diff --git a/net/mosh/files/patch-src_crypto_ocb__internal.cc b/net/mosh/files/patch-src_crypto_ocb__internal.cc
new file mode 100644
index 000000000000..fed2ca4292e3
--- /dev/null
+++ b/net/mosh/files/patch-src_crypto_ocb__internal.cc
@@ -0,0 +1,15 @@
+--- src/crypto/ocb_internal.cc.orig	2022-10-27 01:18:11 UTC
++++ src/crypto/ocb_internal.cc
+@@ -130,10 +130,10 @@
+ 
+ #if _MSC_VER
+ 	#define bswap64(x) _byteswap_uint64(x)
+-#elif HAVE_DECL_BSWAP64
+-	/* nothing */
+ #elif HAVE_DECL___BUILTIN_BSWAP64
+ 	#define bswap64(x) __builtin_bswap64(x)           /* GCC 4.3+ */
++#elif HAVE_DECL_BSWAP64
++	/* nothing */
+ #else
+ 	#define bswap32(x)                                              \
+ 	   ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >>  8) | \