diff --git a/emulators/qemu-user-static/Makefile b/emulators/qemu-user-static/Makefile
index 9521422f9f6b..24caaf8d4cb5 100644
--- a/emulators/qemu-user-static/Makefile
+++ b/emulators/qemu-user-static/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	qemu
 PORTVERSION=	3.1.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-user-static
 DIST_SUBDIR=	qemu/${PORTVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	QEMU CPU Emulator (github bsd-user branch)
 WWW=		https://www.qemu.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=		amd64 powerpc powerpc64
 CONFLICTS_INSTALL=	qemu-user-static-devel
 
 USES=		bison compiler:c11 cpe elfctl gmake perl5 pkgconfig python:build
 USE_GITHUB=	yes
-GH_TUPLE=	qemu-bsd-user:qemu-bsd-user:527096e0c8	\
+GH_TUPLE=	qemu-bsd-user:qemu-bsd-user:f7eaacf0bd	\
 		qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
 MAKE_ENV+=	BSD_MAKE="${MAKE}" V=1
 ELF_FEATURES=	+wxneeded:*-bsd-user/qemu-*
 
 USE_RC_SUBR=	qemu_user_static
 SUB_LIST=	NAME=qemu_user_static
 
 PIE_UNSAFE=	yes
 
 # When static linking we have a build dependency on libglib-2.0.a, otherwise
 # we use glib20 in the usual way (shared-lib runtime dependency).
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libglib-2.0.a:devel/glib20
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--extra-ldflags=-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--extra-cflags=-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-libssh2
 
 QEMU_TARGETS=		i386-bsd-user sparc-bsd-user arm-bsd-user mips-bsd-user mipsel-bsd-user ppc-bsd-user
 .if ${ARCH} == "amd64" || ${ARCH} == "powerpc64"
 QEMU_TARGETS+=		x86_64-bsd-user riscv64-bsd-user sparc64-bsd-user mips64-bsd-user mips64el-bsd-user ppc64-bsd-user aarch64-bsd-user
 PLIST_SUB+=	64BIT=""
 .else
 PLIST_SUB+=	64BIT="@comment "
 .endif
 CONFIGURE_ARGS+=	--target-list=${QEMU_TARGETS:ts,}
 
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CFLAGS+=	-Wno-address-of-packed-member
 CFLAGS+=	-D_WANT_SEMUN
 CFLAGS_powerpc=	-D_CALL_SYSV
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC} --enable-docs \
 	--disable-linux-user --disable-linux-aio \
 	--disable-kvm --disable-xen \
 	--smbd=${LOCALBASE}/sbin/smbd \
 	--enable-debug \
 	--enable-debug-info \
 	--static \
 	--python=${PYTHON_CMD} \
 	--disable-sdl --disable-gtk --disable-vte --disable-gnutls --disable-vnc \
 	--disable-curl --disable-opengl --disable-usb-redir --disable-pcap \
 	--disable-docs --disable-tools --disable-system --disable-guest-agent \
 	--disable-capstone \
 	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
 
 QEMU_ARCH=	${ARCH:C/amd64/x86_64/:C/powerpc/ppc/}
 MAKE_ARGS+=	ARCH=${QEMU_ARCH}
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/etc/rc.d ${WRKDIR}
 	@${RM} -r ${STAGEDIR}${PREFIX}/etc
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	@${MV} ${WRKDIR}/rc.d ${STAGEDIR}${PREFIX}/etc
 	@${RM} -r ${STAGEDIR}${PREFIX}/man
 	@${RM} -r ${STAGEDIR}${DATADIR}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
 	@(cd ${STAGEDIR}${PREFIX}/bin && \
 		for i in qemu-*; do ${MV} -i $$i $$i-static; done)
 
 .include <bsd.port.post.mk>
diff --git a/emulators/qemu-user-static/distinfo b/emulators/qemu-user-static/distinfo
index a2c585e7eedd..8f295a5c0fb8 100644
--- a/emulators/qemu-user-static/distinfo
+++ b/emulators/qemu-user-static/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1641593695
-SHA256 (qemu/3.1.0/qemu-bsd-user-qemu-bsd-user-3.1.0-527096e0c8_GH0.tar.gz) = bf0d139a962d69fbbf2a5834e9906c283e7f300e2620051a9a3910e5bd9dc17f
-SIZE (qemu/3.1.0/qemu-bsd-user-qemu-bsd-user-3.1.0-527096e0c8_GH0.tar.gz) = 16904103
+TIMESTAMP = 1783691020
+SHA256 (qemu/3.1.0/qemu-bsd-user-qemu-bsd-user-3.1.0-f7eaacf0bd_GH0.tar.gz) = 5238b524333767edf3d6bf21240112d1fbdece995d60d8944544874d303725d8
+SIZE (qemu/3.1.0/qemu-bsd-user-qemu-bsd-user-3.1.0-f7eaacf0bd_GH0.tar.gz) = 16902515
 SHA256 (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
 SIZE (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895
diff --git a/emulators/qemu-user-static/files/patch-bsd-user_freebsd_os-stat.h b/emulators/qemu-user-static/files/patch-bsd-user_freebsd_os-stat.h
deleted file mode 100644
index cec077643992..000000000000
--- a/emulators/qemu-user-static/files/patch-bsd-user_freebsd_os-stat.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- bsd-user/freebsd/os-stat.h.orig
-+++ bsd-user/freebsd/os-stat.h
-@@ -702,7 +702,7 @@
-         return -TARGET_EFAULT;
-     }
- 
--    ret = get_errno(__realpathat(arg1, p, b, arg4, arg5));
-+    ret = get_errno(__sys___realpathat(arg1, p, b, arg4, arg5));
-     UNLOCK_PATH(p, arg2);
-     unlock_user(b, arg3, ret);
-