diff --git a/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch b/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch
new file mode 100644
index 0000000000..2bb22bee0b
--- /dev/null
+++ b/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch
@@ -0,0 +1,11 @@
+--- meson.build
++++ meson.build
+@@ -507,7 +507,7 @@ glx_inc = include_directories('glx')
+ 
+ top_srcdir_inc = include_directories('.')
+ 
+-serverconfigdir = join_paths(get_option('libdir'), 'xorg')
++serverconfigdir = join_paths(get_option('prefix'), get_option('libdir'), 'xorg')
+ 
+ manpage_config = configuration_data()
+ manpage_config.set('vendorversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version()))
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 6f216e8298..94870ed8ee 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=6
+revision=7
 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