diff --git a/x11-libs/libxfont/libxfont-1.5.4.recipe b/x11-libs/libxfont/libxfont-1.5.4.recipe
index c1eaae73b..4e58c2048 100644
--- a/x11-libs/libxfont/libxfont-1.5.4.recipe
+++ b/x11-libs/libxfont/libxfont-1.5.4.recipe
@@ -11,17 +11,17 @@ COPYRIGHT="2000, Compaq Computer Corporation.
 	2011 Dave Airlie
 	2006 Keith Packard"
 LICENSE="MIT (no promotion)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libXfont-$portVersion.tar.bz2"
 CHECKSUM_SHA256="1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242"
 SOURCE_DIR="libXfont-$portVersion"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
 libVersion=1.4.1
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
 PROVIDES="
 	libxfont$secondaryArchSuffix = $portVersion
 	lib:libXfont$secondaryArchSuffix = $libVersionCompat
@@ -35,7 +35,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libxfont${secondaryArchSuffix}_devel = $portVersion
-	devel:libXfont$secondaryArchSuffix = $libVersion
+	devel:libXfont$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libxfont$secondaryArchSuffix == $portVersion base
@@ -43,21 +43,25 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:fontsproto$secondaryArchSuffix
+	#docbook_xml_dtd
+	#docbook_xsl_stylesheets
+	devel:fontsproto
 	devel:libfontenc$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:xproto$secondaryArchSuffix
-	devel:xtrans$secondaryArchSuffix
+	devel:util_macros
+	devel:xorg_sgml_doctools
+	devel:xproto
+	devel:xtrans
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
+	#cmd:xmlto
 	"
 
 defineDebugInfoPackage libxfont$secondaryArchSuffix \