diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index bb6c7ff..5414324 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -23,6 +23,7 @@ makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
 source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
         xwayland-config.h.meson.in # missing from tarball
         xserver-autobind-hotplug.patch
+        meson-build.patch
         xvfb-run # with updates from FC master
         xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
@@ -33,6 +34,7 @@ sha512sums=('1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953d
             'SKIP'
             '4ed2a66dd98697accef34f84d44490594bf071232fa74640d514a170f1fbe760b292a0b53fe47080b73acf6083cea57e35f11cfd42ba9dc211b8e8dcac343dfc'
             'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
+            '39db71366522153f870eed5a5c2cc9fcec8b73016faf7cae454daf6c0492be45a69283e015c45c6fc63d595ea3f93770a6c80c60586fd25553937ae9ee852895'
             '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
             'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
 
@@ -49,6 +51,8 @@ prepare() {
 
   # patch from Fedora, not yet merged
   patch -Np1 -i ../xserver-autobind-hotplug.patch
+
+  patch -Np1 -i ../meson-build.patch
 }
 
 build() {
@@ -74,7 +78,8 @@ build() {
     -D systemd_logind=true \
     -D suid_wrapper=true \
     -D xkb_dir=/usr/share/X11/xkb \
-    -D xkb_output_dir=/var/lib/xkb
+    -D xkb_output_dir=/var/lib/xkb \
+    --libexecdir=/usr/lib/xorg-server
      
 #     -D xwayland_eglstream=true \ # requires weston-eglstream from AUR
 
@@ -121,10 +126,11 @@ package_xorg-server() {
   replaces=('glamor-egl' 'xf86-video-modesetting')
   install=xorg-server.install
 
-  
+  mv fakeinstall/usr/bin/Xorg.sh fakeinstall/usr/bin/Xorg
   _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
   ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-  _install fakeinstall/usr/lib/Xorg{,.wrap}
+  _install fakeinstall/usr/lib/xorg-server
+  chmod +s ${pkgdir}/usr/lib/xorg-server/Xorg.wrap
   _install fakeinstall/usr/lib/xorg/modules/*
   _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
   _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1.gz
diff --git a/trunk/meson-build.patch b/trunk/meson-build.patch
new file mode 100644
index 0000000..b545d7a
--- /dev/null
+++ b/trunk/meson-build.patch
@@ -0,0 +1,13 @@
+diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
+index cacf56d4c..40e8494eb 100644
+--- a/hw/xfree86/meson.build
++++ b/hw/xfree86/meson.build
+@@ -147,7 +147,7 @@ if get_option('suid_wrapper')
+     )
+     configure_file(
+         input: 'Xorg.sh.in',
+-        output: 'Xorg',
++        output: 'Xorg.sh',
+         configuration: conf_data,
+         install_dir: join_paths(get_option('prefix'), get_option('bindir')),
+     )