diff --git a/x11-packages/mesa-swrast/build.sh b/x11-packages/mesa-swrast/build.sh
new file mode 100644
index 000000000..6e4cb2832
--- /dev/null
+++ b/x11-packages/mesa-swrast/build.sh
@@ -0,0 +1,38 @@
+TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
+
+## Required by GLX functionality of Xvnc/Xvfb servers and shouldn't be
+## used by used by regular applications.
+##
+## Cannot built as part of package 'mesa' since --enable-glx=xlib
+## require DRI to be disabled.
+
+TERMUX_PKG_HOMEPAGE=https://www.mesa3d.org
+TERMUX_PKG_DESCRIPTION="The legacy/original Mesa software rasterizer"
+## Use 17.3.x branch because 18.x.x requires 'pthread_barrier_t'.
+TERMUX_PKG_VERSION=17.3.9
+TERMUX_PKG_SRCURL=https://mesa.freedesktop.org/archive/mesa-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=c5beb5fc05f0e0c294fefe1a393ee118cb67e27a4dca417d77c297f7d4b6e479
+
+TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libexpat, mesa"
+TERMUX_PKG_BUILD_DEPENDS="xorgproto"
+
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--disable-asm
+--disable-gbm
+--disable-egl
+--disable-gles1
+--disable-gles2
+--enable-glx=dri
+--with-platforms=x11
+--with-dri-drivers=swrast
+--without-gallium-drivers
+ac_cv_header_xlocale_h=no
+"
+
+termux_step_pre_configure () {
+    export LIBS="-landroid-shmem -latomic"
+}
+
+termux_step_make_install() {
+    install -Dm600 ./lib/swrast_dri.so "${TERMUX_PREFIX}/lib/dri/swrast_dri.so"
+}
diff --git a/x11-packages/tigervnc/build.sh b/x11-packages/tigervnc/build.sh
index 98accf69d..68609f84a 100644
--- a/x11-packages/tigervnc/build.sh
+++ b/x11-packages/tigervnc/build.sh
@@ -2,12 +2,12 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 
 TERMUX_PKG_HOMEPAGE=http://www.tigervnc.org/
 TERMUX_PKG_VERSION=1.9.0
-TERMUX_PKG_REVISION=15
+TERMUX_PKG_REVISION=16
 TERMUX_PKG_DESCRIPTION="Suite of VNC servers. Based on the VNC 4 branch of TightVNC."
 TERMUX_PKG_SRCURL=https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f15ced8500ec56356c3bf271f52e58ed83729118361c7103eab64a618441f740
 
-TERMUX_PKG_DEPENDS="freetype, libandroid-support, libandroid-shmem, libbz2, libc++, libdrm, libexpat, libgnutls, libjpeg-turbo, libpixman, libpng, libuuid, libx11, libxau, libxcb, libxdamage, libxdmcp, libxext, libxxf86vm, libxfixes, libxfont2, libxshmfence, mesa, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp"
+TERMUX_PKG_DEPENDS="freetype, libandroid-support, libandroid-shmem, libbz2, libc++, libdrm, libexpat, libgnutls, libjpeg-turbo, libpixman, libpng, libuuid, libx11, libxau, libxcb, libxdamage, libxdmcp, libxext, libxxf86vm, libxfixes, libxfont2, libxshmfence, mesa, mesa-swrast, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-font-util, xorg-util-macros, xorg-server-xvfb, xtrans"
 TERMUX_PKG_SUGGESTS="aterm, xorg-twm"
 
diff --git a/x11-packages/xorg-server-xvfb/build.sh b/x11-packages/xorg-server-xvfb/build.sh
index f894d5aa8..964c0c867 100644
--- a/x11-packages/xorg-server-xvfb/build.sh
+++ b/x11-packages/xorg-server-xvfb/build.sh
@@ -3,11 +3,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=http://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X virtual framebuffer"
 TERMUX_PKG_VERSION=1.20.1
-TERMUX_PKG_REVISION=7
+TERMUX_PKG_REVISION=8
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918
 
-TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp"
+TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, mesa-swrast, openssl, xkeyboard-config, xorg-xkbcomp"
 TERMUX_PKG_CONFLICTS="xorg-xvfb"
 TERMUX_PKG_REPLACES="xorg-xvfb"