diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index e7c5bbd2fcf3..4d3030d07aeb 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -1,51 +1,54 @@
 PORTNAME=	xf86-video-intel
 DISTVERSION=	2.99.917-923
 PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g${GL_TAGNAME:C/(.{12}).*/\1/}
 PORTEPOCH=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org legacy driver for Intel integrated graphics chipsets
 WWW=		https://01.org/linuxgraphics/
 
 LICENSE=	MIT	# various
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	only Intel integrated GPUs on x86 are supported
 
 LIB_DEPENDS=	libdrm_intel.so:graphics/libdrm
 
 USES=		cpe localbase xorg xorg-cat:driver
 CPE_VENDOR=	x
 USE_GITLAB=	yes
 GL_TAGNAME=	b74b67f0f321875492968f7097b9d6e82a66d7df
 USE_XORG=	pciaccess pixman
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ENV=	ac_cv_header_sys_sysinfo_h=no # XXX ports/242236
 CONFIGURE_ARGS=	--with-builderstring="${DISTVERSIONFULL}"
 TEST_TARGET=	check
 
 # XXX bug 214593: SNA crashes on pre-SandyBridge hardware
 CONFIGURE_ARGS+=--with-default-accel=uxa
 
-OPTIONS_DEFINE=	UDEV XVMC
+OPTIONS_DEFINE=	UDEV TOOLS XVMC
 OPTIONS_DEFAULT=UDEV XVMC
 OPTIONS_SUB=	yes
 
 UDEV_DESC=		udev-based monitor hotplug detection
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_CONFIGURE_ENABLE=	udev
 
+TOOLS_DESC=		Install the intel-virtual-output tool
+TOOLS_USE=		XORG=xrandr,xdamage,xfixes,xcursor,xtst,xrender,xscrnsaver,xext,x11,pixman
+TOOLS_CONFIGURE_ENABLE=	tools
+
 XVMC_LIB_DEPENDS=	libxcb-util.so:x11/xcb-util
 XVMC_USE=		XORG=x11,xcb,xvmc
 XVMC_CONFIGURE_ENABLE=	xvmc
 XVMC_VARS=		USE_LDCONFIG=yes
 
 post-patch:
 .if ${CONFIGURE_ARGS:M--with-default-accel=uxa}
 	@${REINPLACE_CMD} '/^Default/s/SNA/UXA/' ${WRKSRC}/man/intel.man
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-intel/files/patch-tools_virtual.c b/x11-drivers/xf86-video-intel/files/patch-tools_virtual.c
new file mode 100644
index 000000000000..4417fff2a6dc
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-tools_virtual.c
@@ -0,0 +1,13 @@
+--- tools/virtual.c.orig	2023-02-01 18:07:58 UTC
++++ tools/virtual.c
+@@ -69,6 +69,10 @@
+ #include <fcntl.h>
+ #include <assert.h>
+ 
++#ifndef ETIME
++#define ETIME ETIMEDOUT
++#endif
++
+ #define FORCE_FULL_REDRAW 0
+ #define FORCE_16BIT_XFER 0
+ 
diff --git a/x11-drivers/xf86-video-intel/pkg-plist b/x11-drivers/xf86-video-intel/pkg-plist
index b181bdad5d38..061a9cf3c0d7 100644
--- a/x11-drivers/xf86-video-intel/pkg-plist
+++ b/x11-drivers/xf86-video-intel/pkg-plist
@@ -1,8 +1,10 @@
+%%TOOLS%%bin/intel-virtual-output
 %%XVMC%%lib/libI810XvMC.so
 %%XVMC%%lib/libI810XvMC.so.1
 %%XVMC%%lib/libI810XvMC.so.1.0.0
 %%XVMC%%lib/libIntelXvMC.so.1
 %%XVMC%%lib/libIntelXvMC.so
 %%XVMC%%lib/libIntelXvMC.so.1.0.0
 lib/xorg/modules/drivers/intel_drv.so
+%%TOOLS%%share/man/man4/intel-virtual-output.4x.gz
 share/man/man4/intel.4x.gz