diff --git a/x11-packages/xorg-fonts-100dpi/build.sh b/x11-packages/xorg-fonts-100dpi/build.sh
index 20fe2203a..f1e5d1d66 100644
--- a/x11-packages/xorg-fonts-100dpi/build.sh
+++ b/x11-packages/xorg-fonts-100dpi/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="X.org 100dpi fonts"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=1.0.3
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_DEPENDS="fontconfig-utils, xorg-font-util, xorg-fonts-alias, xorg-fonts-encodings, xorg-mkfontdir, xorg-mkfontscale"
+TERMUX_PKG_REVISION=4
+TERMUX_PKG_DEPENDS="fontconfig-utils, xorg-font-util, xorg-fonts-alias, xorg-fonts-encodings, xorg-mkfontscale"
 TERMUX_PKG_CONFLICTS="xorg-fonts-lite"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/x11-packages/xorg-fonts-75dpi/build.sh b/x11-packages/xorg-fonts-75dpi/build.sh
index 1f31fa9fc..24fc06a55 100644
--- a/x11-packages/xorg-fonts-75dpi/build.sh
+++ b/x11-packages/xorg-fonts-75dpi/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="X.org 75dpi fonts"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=1.0.3
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_DEPENDS="fontconfig-utils, xorg-font-util, xorg-fonts-alias, xorg-fonts-encodings, xorg-mkfontdir, xorg-mkfontscale"
+TERMUX_PKG_REVISION=4
+TERMUX_PKG_DEPENDS="fontconfig-utils, xorg-font-util, xorg-fonts-alias, xorg-fonts-encodings, xorg-mkfontscale"
 TERMUX_PKG_CONFLICTS="xorg-fonts-lite"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/x11-packages/xorg-mkfontdir/build.sh b/x11-packages/xorg-mkfontdir/build.sh
deleted file mode 100644
index e48514dbd..000000000
--- a/x11-packages/xorg-mkfontdir/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
-TERMUX_PKG_DESCRIPTION="Create an index of scalable font files for X"
-TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
-TERMUX_PKG_VERSION=1.0.7
-TERMUX_PKG_REVISION=6
-TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/archive/individual/app/mkfontdir-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_SHA256=56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530
-TERMUX_PKG_PLATFORM_INDEPENDENT=true
-TERMUX_PKG_DEPENDS="coreutils, dash, findutils, xorg-mkfontscale"
-
-termux_step_create_debscripts() {
-	cp -f "${TERMUX_PKG_BUILDER_DIR}/postinst" ./
-	cp -f "${TERMUX_PKG_BUILDER_DIR}/postrm"   ./
-	cp -f "${TERMUX_PKG_BUILDER_DIR}/triggers" ./
-}
diff --git a/x11-packages/xorg-mkfontscale/build.sh b/x11-packages/xorg-mkfontscale/build.sh
index 5f731614f..03a60d7dd 100644
--- a/x11-packages/xorg-mkfontscale/build.sh
+++ b/x11-packages/xorg-mkfontscale/build.sh
@@ -3,7 +3,16 @@ TERMUX_PKG_DESCRIPTION="Create an index of scalable font files for X"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=1.2.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/archive/individual/app/mkfontscale-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=ca0495eb974a179dd742bfa6199d561bda1c8da4a0c5a667f21fd82aaab6bac7
 TERMUX_PKG_DEPENDS="freetype, libfontenc, zlib"
 TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros, xorgproto"
+TERMUX_PKG_CONFLICTS="xorg-mkfontdir"
+TERMUX_PKG_REPLACES="xorg-mkfontdir"
+
+termux_step_create_debscripts() {
+	cp -f "${TERMUX_PKG_BUILDER_DIR}/postinst" ./
+	cp -f "${TERMUX_PKG_BUILDER_DIR}/postrm"   ./
+	cp -f "${TERMUX_PKG_BUILDER_DIR}/triggers" ./
+}
diff --git a/x11-packages/xorg-mkfontdir/postinst b/x11-packages/xorg-mkfontscale/postinst
similarity index 100%
rename from x11-packages/xorg-mkfontdir/postinst
rename to x11-packages/xorg-mkfontscale/postinst
diff --git a/x11-packages/xorg-mkfontdir/postrm b/x11-packages/xorg-mkfontscale/postrm
similarity index 100%
rename from x11-packages/xorg-mkfontdir/postrm
rename to x11-packages/xorg-mkfontscale/postrm
diff --git a/x11-packages/xorg-mkfontdir/triggers b/x11-packages/xorg-mkfontscale/triggers
similarity index 100%
rename from x11-packages/xorg-mkfontdir/triggers
rename to x11-packages/xorg-mkfontscale/triggers