diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 3838c637558e..bbca5cafa464 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -1,91 +1,90 @@
 PORTNAME=	open-vm-tools
-PORTVERSION=	12.0.0
-PORTREVISION=	1
+PORTVERSION=	12.0.5
 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=	aarch64 amd64 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 \
 		--enable-containerinfo=no \
 		--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,gdkpixbuf2xlib,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/distinfo b/emulators/open-vm-tools/distinfo
index 8c369047ab12..0421003f38cb 100644
--- a/emulators/open-vm-tools/distinfo
+++ b/emulators/open-vm-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646656337
-SHA256 (vmware-open-vm-tools-stable-12.0.0_GH0.tar.gz) = 244d224dc503f2c9350899a61fef418f23dc0520e8e30dce10863ea2dc81f047
-SIZE (vmware-open-vm-tools-stable-12.0.0_GH0.tar.gz) = 2938469
+TIMESTAMP = 1660303917
+SHA256 (vmware-open-vm-tools-stable-12.0.5_GH0.tar.gz) = 19ec67984347bb5f867a5646658c7695352cef772c4bee212a0d9216f02ebd93
+SIZE (vmware-open-vm-tools-stable-12.0.5_GH0.tar.gz) = 2941098
diff --git a/emulators/open-vm-tools/files/vmware-guestd.in b/emulators/open-vm-tools/files/vmware-guestd.in
index 9a5e3c201467..99235082d679 100644
--- a/emulators/open-vm-tools/files/vmware-guestd.in
+++ b/emulators/open-vm-tools/files/vmware-guestd.in
@@ -1,33 +1,33 @@
 #!/bin/sh
 
 # PROVIDE: vmware-guestd
 # REQUIRE: FILESYSTEMS ldconfig
 # BEFORE: LOGIN
 
 # Add these lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # vmware_guestd_enable (bool):	Set to YES by default.
 #				Set it to NO to disable vmware_guestd.
 
 . /etc/rc.subr
 
 name="vmware_guestd"
 rcvar=vmware_guestd_enable
 
 load_rc_config $name
 
-checkvm_cmd="%%PREFIX%%/bin/vmware-checkvm > /dev/null"
-if ${checkvm_cmd} > /dev/null ; then
+checkvm_cmd="%%PREFIX%%/bin/vmware-checkvm > /dev/null 2>&1"
+if ${checkvm_cmd}; then
 	: ${vmware_guestd_enable:="YES"}
 else
 	: ${vmware_guestd_enable:="NO"}
 fi
 
 command="%%PREFIX%%/bin/vmtoolsd"
 pidfile="/var/run/${name}.pid"
 start_precmd="${checkvm_cmd}"
 stop_precmd="${checkvm_cmd}"
 command_args="--background ${pidfile} -c %%PREFIX%%/share/vmware-tools/tools.conf -p %%PREFIX%%/lib/open-vm-tools/plugins/vmsvc"
 
 run_rc_command "$1"