diff --git a/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch b/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch
new file mode 100644
index 00000000000..87017df9b8f
--- /dev/null
+++ b/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch
@@ -0,0 +1,22 @@
+--- hw/xfree86/meson.build.orig
++++ hw/xfree86/meson.build
+@@ -145,12 +145,14 @@
+         install_dir: get_option('libexecdir'),
+         # install_mode: ['r-sr-xr-x', 0, 0],
+     )
+-    configure_file(
+-        input: 'Xorg.sh.in',
+-        output: 'Xorg',
+-        configuration: conf_data,
++    install_data(configure_file(
++			input: 'Xorg.sh.in',
++			output: 'Xorg.sh',
++			configuration: conf_data,
++    	),
++		rename: 'Xorg',
+         install_dir: join_paths(get_option('prefix'), get_option('bindir')),
+-    )
++	)
+ endif
+
+ executable('cvt',
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 126225c4198..bf814c65822 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=1.20.1
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb