diff --git a/host-recipes/xorg-font-util b/host-recipes/xorg-font-util
deleted file mode 100644
index 30e711beb..000000000
--- a/host-recipes/xorg-font-util
+++ /dev/null
@@ -1,17 +0,0 @@
-name=xorg-font-util
-from_source=xorg-font-util
-revision=1
-imagedeps="gcc"
-
-build() {
-    "${source_dir}"/configure --prefix="${prefix}"
-
-    make -j${parallelism}
-}
-
-package() {
-    DESTDIR="${dest_dir}" make install
-
-        strip_command=strip \
-    post_package_strip
-}
diff --git a/recipes/libfontenc b/recipes/libfontenc
index 53aa8132b..1bca6a7c9 100644
--- a/recipes/libfontenc
+++ b/recipes/libfontenc
@@ -3,12 +3,13 @@ version=1.1.7
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libfontenc-${version}.tar.gz"
 tarball_blake2b="538dc45801dd2fc3b18527b5716fd468089206728ce4704416eb0ecd2ed528f951d64e7bf2f779a5852363670724458c966538afcec813a9823f5d04303d1bbb"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros xorg-font-util"
+source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_deps="xorg-font-util"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto zlib"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {
diff --git a/recipes/xorg-server b/recipes/xorg-server
index 6f05df5ea..660f15f8a 100644
--- a/recipes/xorg-server
+++ b/recipes/xorg-server
@@ -3,8 +3,8 @@ version=21.1.10
 revision=1
 tarball_url="https://www.x.org/releases/individual/xserver/xorg-server-${version}.tar.xz"
 tarball_blake2b="c06d5f09e79b608d9e37f43ed05a0932d9e195cc0da418621c2db45be85ccceef38b14631a4b90e78468c845e4852dc07c65208138b93975f091b2139e437a60"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros xorg-font-util"
-source_deps="xtrans"
+source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_deps="xtrans xorg-font-util"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto xcb-proto xtrans libxcvt libxshmfence libx11 libxaw libxxf86vm libxkbfile libxmu libxfont2 libepoxy libxi libxv libxdamage libxrender libxrandr libxcb libxfixes libxext nettle xorg-xkbcomp xkeyboard-config pixman"