diff --git a/tigervnc.be0 b/tigervnc.be0
index b1f64f9eb..cc12b550a 100755
--- a/tigervnc.be0
+++ b/tigervnc.be0
@@ -2,6 +2,9 @@
 
 # BEE_VERSION tigervnc-1.8.0-0
 
+XORG_SERVER_VERSION=1.19.6
+XORG_SERVER_NNN=119
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 
@@ -10,6 +13,7 @@
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
 SRCURL[0]="https://github.com/TigerVNC/tigervnc/archive/v${PKGVERSION}/tigervnc-${PKGVERSION}.tar.gz"
+SRCURL[1]="https://ftp.x.org/pub/individual/xserver/xorg-server-$XORG_SERVER_VERSION.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -55,15 +59,52 @@ SRCURL[0]="https://github.com/TigerVNC/tigervnc/archive/v${PKGVERSION}/tigervnc-
 
 mee_configure() {
     bee_configure -DFLTK_LIBRARIES="$(fltk-config --use-images --ldflags)"
+    (
+        if [ -z "${DEFCONFIG}" ] ; then
+            for var in prefix bindir sbindir libexecdir sysconfdir \
+                sharedstatedir localstatedir libdir includedir \
+                datarootdir datadir infodir localedir mandir docdir ; do
+                DEFCONFIG="${DEFCONFIG} \${${var^^}:+--${var,,}=\${${var^^}}}"
+            done
+        fi
+        eval DEFCONFIG=\"${DEFCONFIG}\"
+
+        start_cmd cp -R $S/unix/xserver $B/unix/
+        start_cmd cp -R $S/xorg-server-$XORG_SERVER_VERSION/* $B/unix/xserver/
+        start_cmd cd unix/xserver
+        start_cmd patch -p1 < $S/unix/xserver$XORG_SERVER_NNN.patch
+        start_cmd autoreconf -fiv
+        start_cmd ./configure $DEFCONFIG \
+            --with-pic --without-dtrace --disable-static --disable-dri \
+            --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
+            --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
+            --disable-config-hal --disable-config-udev \
+            --disable-dri2 --enable-glx \
+            --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
+            --with-xkb-path=/usr/share/X11/xkb \
+            --with-xkb-output=/var/lib/xkb \
+            --with-xkb-bin-directory=/usr/bin \
+            --with-serverconfig-path=/usr/lib[64]/xorg \
+            --disable-xwayland
+    )
 }
 
-#mee_build() {
-#    bee_build
-#}
+mee_build() {
+    bee_build
+    (
+        start_cmd cd $B/unix/xserver
+        bee_build TIGERVNC_SRCDIR=$S
+    )
+}
 
-#mee_install() {
-#    bee_install
-#}
+mee_install() {
+    bee_install
+    (
+        start_cmd cd $B/unix/xserver
+        bee_install
+        rm $D$MANDIR/man1/Xserver.1
+    )
+}
 ## by default this may be 'make install DESTDIR="${D}"'
 
 ###############################################################################