diff --git a/x11-packages/tigervnc/build.sh b/x11-packages/tigervnc/build.sh
index af5994ffe..75be1d7d7 100644
--- a/x11-packages/tigervnc/build.sh
+++ b/x11-packages/tigervnc/build.sh
@@ -2,7 +2,7 @@ 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=12
+TERMUX_PKG_REVISION=13
 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
diff --git a/x11-packages/xorg-server-xvfb/build.sh b/x11-packages/xorg-server-xvfb/build.sh
index f6a09c439..f894d5aa8 100644
--- a/x11-packages/xorg-server-xvfb/build.sh
+++ b/x11-packages/xorg-server-xvfb/build.sh
@@ -3,7 +3,7 @@ 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=6
+TERMUX_PKG_REVISION=7
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918
 
@@ -12,50 +12,44 @@ TERMUX_PKG_CONFLICTS="xorg-xvfb"
 TERMUX_PKG_REPLACES="xorg-xvfb"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
---enable-glx
 --enable-composite
 --enable-mitshm
 --enable-xres
 --enable-record
---disable-xv
---disable-xvmc
---disable-screensaver
+--enable-xv
+--enable-xvmc
+--enable-dga
+--enable-screensaver
+--enable-xdmcp
+--enable-glx
+--enable-dri
+--enable-dri2
+--enable-dri3
 --enable-present
---disable-xace
---disable-dbe
---disable-dpms
+--enable-xinerama
+--enable-xf86vidmode
+--enable-xace
+--enable-xcsecurity
+--enable-dbe
+--enable-xf86bigfont
 --disable-xfree86-utils
 --disable-vgahw
 --disable-vbe
 --disable-int10-module
+--enable-libdrm
 --disable-pciaccess
---disable-dri
---disable-input-thread
---disable-glamor
---disable-xf86vidmode
---disable-xf86bigfont
---disable-clientids
 --disable-linux-acpi
 --disable-linux-apm
---disable-strict-compilation
---disable-visibility
---disable-xnest
---disable-xquartz
---disable-xwin
---disable-xwayland
---disable-standalone-xpbproxy
---disable-kdrive
---disable-kdrive-evdev
---disable-kdrive-kbd
---disable-xephyr
---disable-xfake
---disable-xfbdev
---disable-secure-rpc
---enable-input-thread
---enable-xtrans-send-fds
 --disable-xorg
---enable-xvfb
 --disable-dmx
+--enable-xvfb
+--disable-xnest
+--disable-xwayland
+--disable-xwin
+--disable-kdrive
+--disable-xephyr
+--disable-libunwind
+--enable-xshmfence
 --enable-ipv6
 --with-sha1=libcrypto
 --with-fontrootdir=${TERMUX_PREFIX}/share/fonts
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_Xext_xf86bigfont.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_Xext_xf86bigfont.c.patch
new file mode 100644
index 000000000..c248c2faa
--- /dev/null
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_Xext_xf86bigfont.c.patch
@@ -0,0 +1,20 @@
+diff -uNr xorg-server-1.20.1/Xext/xf86bigfont.c xorg-server-1.20.1.mod/Xext/xf86bigfont.c
+--- xorg-server-1.20.1/Xext/xf86bigfont.c	2018-08-07 19:31:00.000000000 +0300
++++ xorg-server-1.20.1.mod/Xext/xf86bigfont.c	2018-10-08 21:07:49.005945142 +0300
+@@ -715,16 +715,7 @@
+         /* fprintf(stderr, "signature = 0x%08X\n", signature); */
+ 
+         FontShmdescIndex = xfont2_allocate_font_private_index();
+-
+-#if !defined(CSRG_BASED) && !defined(__CYGWIN__)
+-        pagesize = SHMLBA;
+-#else
+-#ifdef _SC_PAGESIZE
+         pagesize = sysconf(_SC_PAGESIZE);
+-#else
+-        pagesize = getpagesize();
+-#endif
+-#endif
+ #endif
+     }
+ }
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch
index 82927de46..46ed95dde 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/hw/xfree86/common/compiler.h xorg-server-1.20.1.mod/hw/xfree86/common/compiler.h
 --- xorg-server-1.20.1/hw/xfree86/common/compiler.h	2018-08-07 19:31:02.000000000 +0300
-+++ xorg-server-1.20.1.mod/hw/xfree86/common/compiler.h	2018-10-03 00:40:35.481555908 +0300
++++ xorg-server-1.20.1.mod/hw/xfree86/common/compiler.h	2018-10-08 21:07:16.804247702 +0300
 @@ -518,7 +518,7 @@
      barrier();
  }
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch
index 9d7bd22dd..7b459ac65 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/hw/xfree86/common/xf86Config.c xorg-server-1.20.1.mod/hw/xfree86/common/xf86Config.c
 --- xorg-server-1.20.1/hw/xfree86/common/xf86Config.c	2018-08-07 19:31:02.000000000 +0300
-+++ xorg-server-1.20.1.mod/hw/xfree86/common/xf86Config.c	2018-10-03 00:40:35.484889280 +0300
++++ xorg-server-1.20.1.mod/hw/xfree86/common/xf86Config.c	2018-10-08 21:07:16.807582583 +0300
 @@ -106,7 +106,7 @@
  #define SYS_CONFIGDIRPATH	"%D/X11/%X"
  #endif
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch
index 90354c8b2..b6dff7c5a 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/hw/xfree86/os-support/linux/lnx_acpi.c xorg-server-1.20.1.mod/hw/xfree86/os-support/linux/lnx_acpi.c
 --- xorg-server-1.20.1/hw/xfree86/os-support/linux/lnx_acpi.c	2018-08-07 19:31:03.000000000 +0300
-+++ xorg-server-1.20.1.mod/hw/xfree86/os-support/linux/lnx_acpi.c	2018-10-03 00:40:35.484889280 +0300
++++ xorg-server-1.20.1.mod/hw/xfree86/os-support/linux/lnx_acpi.c	2018-10-08 21:07:16.807582583 +0300
 @@ -15,7 +15,7 @@
  #include <fcntl.h>
  #include <errno.h>
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_kmod.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_kmod.c.patch
index dff28c278..b70001f67 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_kmod.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_kmod.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/hw/xfree86/os-support/linux/lnx_kmod.c xorg-server-1.20.1.mod/hw/xfree86/os-support/linux/lnx_kmod.c
 --- xorg-server-1.20.1/hw/xfree86/os-support/linux/lnx_kmod.c	2018-08-07 19:31:03.000000000 +0300
-+++ xorg-server-1.20.1.mod/hw/xfree86/os-support/linux/lnx_kmod.c	2018-10-03 00:41:52.675784872 +0300
++++ xorg-server-1.20.1.mod/hw/xfree86/os-support/linux/lnx_kmod.c	2018-10-08 21:07:16.810917466 +0300
 @@ -68,14 +68,6 @@
       */
      switch (pid = fork()) {
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch
index 1c3dc81c0..00f53c55a 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/hw/xfree86/parser/scan.c xorg-server-1.20.1.mod/hw/xfree86/parser/scan.c
 --- xorg-server-1.20.1/hw/xfree86/parser/scan.c	2018-08-07 19:31:03.000000000 +0300
-+++ xorg-server-1.20.1.mod/hw/xfree86/parser/scan.c	2018-10-03 00:40:35.488222652 +0300
++++ xorg-server-1.20.1.mod/hw/xfree86/parser/scan.c	2018-10-08 21:07:16.814252348 +0300
 @@ -873,13 +873,13 @@
   */
  
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_write.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_write.c.patch
index e7cc17a0e..f43508a3a 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_write.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_write.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/hw/xfree86/parser/write.c xorg-server-1.20.1.mod/hw/xfree86/parser/write.c
 --- xorg-server-1.20.1/hw/xfree86/parser/write.c	2018-08-07 19:31:03.000000000 +0300
-+++ xorg-server-1.20.1.mod/hw/xfree86/parser/write.c	2018-10-03 00:43:26.723526291 +0300
++++ xorg-server-1.20.1.mod/hw/xfree86/parser/write.c	2018-10-08 21:07:16.817587230 +0300
 @@ -129,64 +129,5 @@
  int
  xf86writeConfigFile(const char *filename, XF86ConfigPtr cptr)
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_xorg-wrapper.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_xorg-wrapper.c.patch
index 8934f29a0..73293e19a 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_xorg-wrapper.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_xorg-wrapper.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/hw/xfree86/xorg-wrapper.c xorg-server-1.20.1.mod/hw/xfree86/xorg-wrapper.c
 --- xorg-server-1.20.1/hw/xfree86/xorg-wrapper.c	2018-08-07 19:31:04.000000000 +0300
-+++ xorg-server-1.20.1.mod/hw/xfree86/xorg-wrapper.c	2018-10-03 00:50:13.091358398 +0300
++++ xorg-server-1.20.1.mod/hw/xfree86/xorg-wrapper.c	2018-10-08 21:07:16.817587230 +0300
 @@ -251,23 +251,6 @@
      }
  #endif
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch
index 14d548af9..1e40cf5dd 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/hw/xquartz/mach-startup/bundle-main.c xorg-server-1.20.1.mod/hw/xquartz/mach-startup/bundle-main.c
 --- xorg-server-1.20.1/hw/xquartz/mach-startup/bundle-main.c	2018-08-07 19:31:04.000000000 +0300
-+++ xorg-server-1.20.1.mod/hw/xquartz/mach-startup/bundle-main.c	2018-10-03 00:40:35.491556024 +0300
++++ xorg-server-1.20.1.mod/hw/xquartz/mach-startup/bundle-main.c	2018-10-08 21:07:16.820922112 +0300
 @@ -79,7 +79,7 @@
  
  #define DEFAULT_CLIENT X11BINDIR "/xterm"
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch
index ff6acf41a..6bbc722aa 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/hw/xwin/InitOutput.c xorg-server-1.20.1.mod/hw/xwin/InitOutput.c
 --- xorg-server-1.20.1/hw/xwin/InitOutput.c	2018-08-07 19:31:04.000000000 +0300
-+++ xorg-server-1.20.1.mod/hw/xwin/InitOutput.c	2018-10-03 00:40:35.494889396 +0300
++++ xorg-server-1.20.1.mod/hw/xwin/InitOutput.c	2018-10-08 21:07:16.824256995 +0300
 @@ -285,7 +285,7 @@
          level = none, curlevel;
      BOOL binary = TRUE;
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_include_site.h.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_include_site.h.patch
index 4a3aafc1c..53787afd0 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_include_site.h.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_include_site.h.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/include/site.h xorg-server-1.20.1.mod/include/site.h
 --- xorg-server-1.20.1/include/site.h	2018-08-07 19:31:05.000000000 +0300
-+++ xorg-server-1.20.1.mod/include/site.h	2018-10-03 00:40:35.498222769 +0300
++++ xorg-server-1.20.1.mod/include/site.h	2018-10-08 21:07:16.824256995 +0300
 @@ -72,7 +72,7 @@
   * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE!
   */
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_access.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_access.c.patch
index 96ae40c3b..c62771cec 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_access.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_access.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/os/access.c xorg-server-1.20.1.mod/os/access.c
 --- xorg-server-1.20.1/os/access.c	2018-08-07 19:31:05.000000000 +0300
-+++ xorg-server-1.20.1.mod/os/access.c	2018-10-03 00:40:35.501556141 +0300
++++ xorg-server-1.20.1.mod/os/access.c	2018-10-08 21:07:16.834261640 +0300
 @@ -961,7 +961,7 @@
  #if defined WIN32 && defined __MINGW32__
  #define ETC_HOST_PREFIX "X"
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_backtrace.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_backtrace.c.patch
index 57644602c..ab9f5931e 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_backtrace.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_backtrace.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/os/backtrace.c xorg-server-1.20.1.mod/os/backtrace.c
 --- xorg-server-1.20.1/os/backtrace.c	2018-08-07 19:31:05.000000000 +0300
-+++ xorg-server-1.20.1.mod/os/backtrace.c	2018-10-03 00:43:52.883822427 +0300
++++ xorg-server-1.20.1.mod/os/backtrace.c	2018-10-08 21:07:16.834261640 +0300
 @@ -244,14 +244,13 @@
          /* CHILD */
          char parent[16];
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_connection.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_connection.c.patch
index 083f20732..0de201d29 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_connection.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_connection.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/os/connection.c xorg-server-1.20.1.mod/os/connection.c
 --- xorg-server-1.20.1/os/connection.c	2018-08-07 19:31:05.000000000 +0300
-+++ xorg-server-1.20.1.mod/os/connection.c	2018-10-03 00:40:35.511556258 +0300
++++ xorg-server-1.20.1.mod/os/connection.c	2018-10-08 21:07:16.837596523 +0300
 @@ -996,7 +996,7 @@
      XtransConnInfo ciptr;
      const char *display_env = getenv("DISPLAY");
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_osinit.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_osinit.c.patch
index 84c9d71d0..f48a44c32 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_osinit.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_osinit.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/os/osinit.c xorg-server-1.20.1.mod/os/osinit.c
 --- xorg-server-1.20.1/os/osinit.c	2018-08-07 19:31:05.000000000 +0300
-+++ xorg-server-1.20.1.mod/os/osinit.c	2018-10-03 00:40:35.514889630 +0300
++++ xorg-server-1.20.1.mod/os/osinit.c	2018-10-08 21:07:16.840931406 +0300
 @@ -72,7 +72,7 @@
  #endif
  
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_utils.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_utils.c.patch
index 4fa7b13cc..507feb648 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_utils.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_utils.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/os/utils.c xorg-server-1.20.1.mod/os/utils.c
 --- xorg-server-1.20.1/os/utils.c	2018-08-07 19:31:05.000000000 +0300
-+++ xorg-server-1.20.1.mod/os/utils.c	2018-10-03 00:48:19.253449801 +0300
++++ xorg-server-1.20.1.mod/os/utils.c	2018-10-08 21:07:16.844266287 +0300
 @@ -228,7 +228,7 @@
   * server at a time.  This keeps the servers from stomping on each other
   * if the user forgets to give them different display numbers.
diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_xkb_ddxLoad.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_xkb_ddxLoad.c.patch
index 6242ecf0a..91325e314 100644
--- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_xkb_ddxLoad.c.patch
+++ b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_xkb_ddxLoad.c.patch
@@ -1,6 +1,6 @@
 diff -uNr xorg-server-1.20.1/xkb/ddxLoad.c xorg-server-1.20.1.mod/xkb/ddxLoad.c
 --- xorg-server-1.20.1/xkb/ddxLoad.c	2018-08-07 19:31:06.000000000 +0300
-+++ xorg-server-1.20.1.mod/xkb/ddxLoad.c	2018-10-03 00:40:35.524889748 +0300
++++ xorg-server-1.20.1.mod/xkb/ddxLoad.c	2018-10-08 21:07:16.844266287 +0300
 @@ -76,8 +76,8 @@
      }
      else