diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index e243cf0085bf..53b597627f74 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -1,92 +1,92 @@
 # Created by: mbr@FreeBSD.org
 
 PORTNAME=	open-vm-tools
 PORTVERSION=	11.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	stable-
 PORTEPOCH=	2
 CATEGORIES=	emulators
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Open VMware tools for FreeBSD VMware guests ${${FLAVOR}_COMMENT}
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 aarch64 i386
 
 LIB_DEPENDS=	libdnet.so:net/libdnet \
 		libmspack.so:archivers/libmspack
 
 FLAVORS=			default nox11
 default_CONFLICTS_INSTALL=	open-vm-tools-nox11
 nox11_PKGNAMESUFFIX=		-nox11
 nox11_CONFLICTS_INSTALL=	open-vm-tools
 nox11_COMMENT=			(without X11)
 
 USES=		autoreconf gettext-runtime gnome kmod libtool localbase \
 		pathfix pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vmware
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	vmware-guestd vmware-kmod
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-vgauth \
 		--sysconfdir=${PREFIX}/etc \
 		--without-icu
 CONFIGURE_ENV+=	SYSDIR=${SRC_BASE}/sys
 
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-Wno-deprecated-declarations
 SSP_UNSAFE=	kernel module does not support ssp
 
 WRKSRC_SUBDIR=	open-vm-tools
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS FUSE LIBNOTIFY OPENSSL X11
 OPTIONS_DEFAULT=DOCS FUSE LIBNOTIFY OPENSSL X11
 .if ${FLAVOR:U} == nox11
 OPTIONS_EXCLUDE:=	LIBNOTIFY X11
 .endif
 OPTIONS_SUB=
 
 LIBNOTIFY_DESC=		Desktop notification support
 
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_CONFIGURE_ENABLE=	docs
 FUSE_USES=		fuse
 LIBNOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 OPENSSL_CONFIGURE_WITH=	ssl
 X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 X11_USES=		xorg
 X11_USE=		GNOME=gdkpixbuf2,gtk30,gtkmm30 \
 			XORG=ice,sm,x11,xext,xi,xinerama,xorgproto,xrandr,xrender,xtst
 X11_CONFIGURE_WITH=	gtk3 gtkmm3 x
 
 post-patch:
 	@${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@"\
 		${WRKSRC}/lib/guestApp/guestApp.c
 
 post-build:
 	cd ${WRKSRC}/modules && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/input
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko \
 		${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko \
 		${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/tools.conf \
 		${STAGEDIR}${DATADIR}/tools.conf.sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/vmware/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/tests/
 
 .include <bsd.port.mk>
diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_subr.c b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_subr.c
new file mode 100644
index 000000000000..c64602d1b9e5
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_subr.c
@@ -0,0 +1,17 @@
+--- modules/freebsd/vmblock/subr.c.orig	2022-02-04 12:59:09 UTC
++++ modules/freebsd/vmblock/subr.c
+@@ -392,7 +392,13 @@ VMBlockNodeGet(struct mount *mp,        // IN: VMBlock
+    }
+ 
+    /* Before FreeBSD 7, insmntque was called by getnewvnode. */
+-#if __FreeBSD_version >= 700055
++#if __FreeBSD_version >= 1400051
++   error = insmntque1(vp, mp);
++   if (error != 0) {
++      VMBlockInsMntQueDtr(vp, xp);
++      return error;
++   }
++#else
+    error = insmntque1(vp, mp, VMBlockInsMntQueDtr, xp);
+    if (error != 0) {
+       return error;