diff --git a/x11-packages/libevdev/build.sh b/x11-packages/libevdev/build.sh
index 567511a34..e5efd22a8 100644
--- a/x11-packages/libevdev/build.sh
+++ b/x11-packages/libevdev/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 
-TERMUX_PKG_HOMEPAGE=http://x.org
-TERMUX_PKG_DESCRIPTION="Kernel evdev device wrapper library"
+TERMUX_PKG_HOMEPAGE=http://www.freedesktop.org/wiki/Software/libevdev/
+TERMUX_PKG_DESCRIPTION="Wrapper library for evdev devices"
 TERMUX_PKG_VERSION=1.6.0
 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/libevdev/libevdev-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=f5005c865987d980cc1279b9ec6131b06a89fd9892f649f2a68262b8786ef814
diff --git a/x11-packages/libmtdev/build.sh b/x11-packages/libmtdev/build.sh
deleted file mode 100644
index 63ac54974..000000000
--- a/x11-packages/libmtdev/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-TERMUX_PKG_HOMEPAGE=http://bitmath.org/code/mtdev/
-TERMUX_PKG_DESCRIPTION="Multitouch Protocol Translation Library"
-TERMUX_PKG_VERSION=1.1.5
-TERMUX_PKG_SRCURL=http://bitmath.org/code/mtdev/mtdev-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=a662924dd09cf538c8df66514da345e40c3cbfa880cc7262bc3b55ee46d0c1f4
diff --git a/x11-packages/libpciaccess/build.sh b/x11-packages/libpciaccess/build.sh
index c006c2d2c..94aecdc5b 100644
--- a/x11-packages/libpciaccess/build.sh
+++ b/x11-packages/libpciaccess/build.sh
@@ -1,4 +1,8 @@
-TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org
+TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
+
+TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
+TERMUX_PKG_DESCRIPTION="X11 PCI access library"
 TERMUX_PKG_VERSION=0.14
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libpciaccess-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4
diff --git a/x11-packages/mtdev/build.sh b/x11-packages/mtdev/build.sh
new file mode 100644
index 000000000..e03c4d607
--- /dev/null
+++ b/x11-packages/mtdev/build.sh
@@ -0,0 +1,7 @@
+TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
+
+TERMUX_PKG_HOMEPAGE=http://bitmath.org/code/mtdev/
+TERMUX_PKG_DESCRIPTION="A stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol"
+TERMUX_PKG_VERSION=1.1.5
+TERMUX_PKG_SRCURL=http://bitmath.org/code/mtdev/mtdev-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=a662924dd09cf538c8df66514da345e40c3cbfa880cc7262bc3b55ee46d0c1f4
diff --git a/x11-packages/xf86-input-evdev/build.sh b/x11-packages/xf86-input-evdev/build.sh
index bb9d8b077..d850b9ae4 100644
--- a/x11-packages/xf86-input-evdev/build.sh
+++ b/x11-packages/xf86-input-evdev/build.sh
@@ -1,13 +1,14 @@
-TERMUX_PKG_HOMEPAGE=http://x.org/
-TERMUX_PKG_DESCRIPTION="Kernel evdev device driver"
+TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
+
+TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
+TERMUX_PKG_DESCRIPTION="X.org evdev input driver"
 TERMUX_PKG_VERSION=2.10.6
-TERMUX_PKG_SRCURL=https://www.x.org/archive/individual/driver/xf86-input-evdev-$TERMUX_PKG_VERSION.tar.bz2
+TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=8726073e81861bc7b2321e76272cbdbd33c7e1a121535a9827977265b9033ec0
+TERMUX_PKG_DEPENDS="libevdev, mtdev, xorg-server"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS=""
-#TERMUX_PKG_HOSTBUILD=true
-TERMUX_PKG_DEPENDS="xorg-server, libevdev, libmtdev"
+
 termux_step_pre_configure() {
-	autoreconf -if
-	export LDFLAGS="$LDFLAGS -lXFree86"
+    autoreconf -if
+    export LDFLAGS="${LDFLAGS} -lXFree86"
 }
diff --git a/x11-packages/xf86-input-mtev/build.sh b/x11-packages/xf86-input-mtev/build.sh
index 0909314c5..277c341fc 100644
--- a/x11-packages/xf86-input-mtev/build.sh
+++ b/x11-packages/xf86-input-mtev/build.sh
@@ -1,18 +1,28 @@
-TERMUX_PKG_HOMEPAGE=http://x.org/
-TERMUX_PKG_DESCRIPTION="X.org mtev driver"
+TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
+
+TERMUX_PKG_HOMEPAGE=https://github.com/twaik/xorg-input-mtev
+TERMUX_PKG_DESCRIPTION="X.org mtev input driver"
 TERMUX_PKG_VERSION=1.0
-TERMUX_PKG_SRCURL=https://github.com/twaik/xorg-input-mtev/archive/$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SRCURL=https://github.com/twaik/xorg-input-mtev/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=faecee79322b82c56b35422be3077f7c85a6d16d5ed8e3b3be809b7e765dd4ae
+TERMUX_PKG_DEPENDS="mtdev, xorg-server"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_CLANG=no
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS=""
-TERMUX_PKG_DEPENDS="libmtdev, xorg-server"
 
 termux_step_make() {
-	${CC} -o mtev_drv.so -shared -Wl,-soname -Wl,mtev_drv.so -lXFree86 `pkg-config --libs mtdev` -I$TERMUX_PREFIX/include/xorg -I$TERMUX_PREFIX/include/pixman-1 `pkg-config --cflags mtdev` ${CFLAGS} ${LDFLAGS} src/caps.c src/hw.c src/mtouch.c src/multitouch.c
+    ${CC} \
+        src/caps.c src/hw.c src/mtouch.c src/multitouch.c \
+        $(pkg-config --cflags mtdev) \
+        ${CFLAGS} \
+        -I${TERMUX_PREFIX}/include/xorg \
+        -I${TERMUX_PREFIX}/include/pixman-1 \
+        -shared \
+        -Wl,-soname -Wl,mtev_drv.so \
+        ${LDFLAGS} \
+        -lXFree86 \
+        $(pkg-config --libs mtdev) \
+        -o mtev_drv.so
 }
 
 termux_step_make_install() {
-	install -d "$TERMUX_PREFIX/lib/xorg/modules/input"
-	install -m 755 mtev_drv.so "$TERMUX_PREFIX/lib/xorg/modules/input/mtev_drv.so"
+    install -Dm600 mtev_drv.so "${TERMUX_PREFIX}/lib/xorg/modules/input/mtev_drv.so"
 }
diff --git a/x11-packages/xf86-video-dummy/build.sh b/x11-packages/xf86-video-dummy/build.sh
index 1882efe9b..28047addc 100644
--- a/x11-packages/xf86-video-dummy/build.sh
+++ b/x11-packages/xf86-video-dummy/build.sh
@@ -1,9 +1,13 @@
+TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
+
+TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
+TERMUX_PKG_DESCRIPTION="X.org dummy video driver"
 TERMUX_PKG_VERSION=0.3.8
-TERMUX_PKG_SRCURL=https://www.x.org/archive/individual/driver/xf86-video-dummy-$TERMUX_PKG_VERSION.tar.bz2
+TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=3712bb869307233491e4c570732d6073c0dc3d99adfdb9977396a3fdf84e95b9
-TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="xorg-server"
-termux_step_pre_configure () {
-	autoreconf -if
-	export LDFLAGS="$LDFLAGS -lXFree86"
+TERMUX_PKG_BUILD_IN_SRC=yes
+
+termux_step_pre_configure() {
+    export LDFLAGS="${LDFLAGS} -lXFree86"
 }
diff --git a/x11-packages/xf86-video-fbdev/build.sh b/x11-packages/xf86-video-fbdev/build.sh
index 4c074fb0a..6127ea44c 100644
--- a/x11-packages/xf86-video-fbdev/build.sh
+++ b/x11-packages/xf86-video-fbdev/build.sh
@@ -1,9 +1,13 @@
+TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
+
+TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
+TERMUX_PKG_DESCRIPTION="X.org framebuffer video driver"
 TERMUX_PKG_VERSION=0.5.0
-TERMUX_PKG_SRCURL=https://www.x.org/archive/individual/driver/xf86-video-fbdev-$TERMUX_PKG_VERSION.tar.bz2
+TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/driver/xf86-video-fbdev-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699
+TERMUX_PKG_DEPENDS="freetype, libandroid-shmem, libpixman, libxau, libxdmcp, libxfont2, libxshmfence, openssl, xorg-server"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_DEPENDS="xorg-server"
 
 termux_step_pre_configure() {
-	export LDFLAGS="$LDFLAGS -lXFree86"
+    export LDFLAGS="${LDFLAGS} -lXFree86"
 }