diff --git a/x11-packages/xwayland/build.sh b/x11-packages/xwayland/build.sh
index ed64560aa..23bafa5a0 100644
--- a/x11-packages/xwayland/build.sh
+++ b/x11-packages/xwayland/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Wayland X11 server"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.20.5
-TERMUX_PKG_REVISION=13
+TERMUX_PKG_REVISION=14
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d
 TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpciaccess, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp, libwayland, libwayland-protocols, libepoxy"
@@ -52,27 +52,30 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-sha1=libcrypto
 --with-fontrootdir=${TERMUX_PREFIX}/share/fonts
 --with-xkb-path=${TERMUX_PREFIX}/share/X11/xkb
+--with-serverconfig-path=${TERMUX_PREFIX}/etc/xwayland
 LIBS=-landroid-shmem"
 
-termux_step_pre_configure () {
-    CFLAGS+=" -fcommon -fPIC -DFNDELAY=O_NDELAY -Wno-int-to-pointer-cast"
-    CPPFLAGS+=" -fcommon -fPIC -I${TERMUX_PREFIX}/include/libdrm"
+# Remove files conflicting with xorg-server:
+TERMUX_PKG_RM_AFTER_INSTALL="
+share/X11/xkb/compiled
+share/man/man1/Xserver.1
+"
 
-    if [ "${TERMUX_DEBUG_BUILD}" = "true" ]; then
-        TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-debug"
-    fi
+termux_step_pre_configure() {
+	CFLAGS+=" -fcommon -fPIC -DFNDELAY=O_NDELAY -Wno-int-to-pointer-cast"
+	CPPFLAGS+=" -fcommon -fPIC -I${TERMUX_PREFIX}/include/libdrm"
 
-    # fixing automake version mismatch
-    cd ${TERMUX_PKG_SRCDIR}
-    files=`find . -name configure -o -name config.status -o -name Makefile.in`
-    for file in $files; do rm $file; done
-    unset files
+	if [ "${TERMUX_DEBUG_BUILD}" = "true" ]; then
+		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-debug"
+	fi
 
-    #you will need xutils-dev package for xorg-macros installed
-    autoreconf -if
-    cd -
-}
-
-termux_step_post_make_install () {
-    rm -f "${TERMUX_PREFIX}/usr/share/X11/xkb/compiled"
+	# fixing automake version mismatch
+	cd ${TERMUX_PKG_SRCDIR}
+	files=`find . -name configure -o -name config.status -o -name Makefile.in`
+	for file in $files; do rm $file; done
+	unset files
+
+	#you will need xutils-dev package for xorg-macros installed
+	autoreconf -if
+	cd -
 }