diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xorg
 PORTVERSION=	21.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
@@ -58,7 +58,6 @@
 		-Dxselinux=false \
 		-Dfallback_input_driver=libinput \
 		-Ddocs=false \
-		-Dudev_kms=false \
 		-Dxcsecurity=true \
 		-Dxkb_dir=${LOCALBASE}/share/X11/xkb \
 		-Dxkb_output_dir=/var/lib/xkb \
@@ -72,10 +71,12 @@
 LIB_DEPENDS+=		libudev.so:devel/libudev-devd \
 			libxcvt.so:x11/libxcvt
 MESON_ARGS+=	-Dudev=true \
+		-Dudev_kms=true \
 		-Dlog_dir=/var/log \
 		-Dsuid_wrapper=true
 .else
-MESON_ARGS+=	-Dudev=false
+MESON_ARGS+=	-Dudev=false \
+		-Dudev_kms=false
 .endif
 
 .if ${FLAVOR} == xorg || ${FLAVOR} == xephyr
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
--- a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
@@ -1,14 +1,15 @@
---- hw/xfree86/os-support/meson.build.orig	2022-07-12 13:27:57 UTC
+--- hw/xfree86/os-support/meson.build.orig	2023-03-29 12:55:03 UTC
 +++ hw/xfree86/os-support/meson.build
-@@ -96,6 +96,7 @@ elif host_machine.system().endswith('bsd')
+@@ -96,6 +96,8 @@ elif host_machine.system().endswith('bsd')
          'bsd/bsd_VTsw.c',
          'bsd/bsd_bell.c',
          'bsd/bsd_init.c',
++        'linux/lnx_platform.c',
 +        'misc/SlowBcopy.c',
  	'shared/pm_noop.c'
      ]
  
-@@ -111,9 +112,9 @@ elif host_machine.system().endswith('bsd')
+@@ -111,9 +113,9 @@ elif host_machine.system().endswith('bsd')
          if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
              os_dep += cc.find_library('i386')
          endif