diff --git a/x11-libs/libfontenc/libfontenc-1.1.3.recipe b/x11-libs/libfontenc/libfontenc-1.1.3.recipe
index 55ca7b691..719c33e3f 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.3.recipe
+++ b/x11-libs/libfontenc/libfontenc-1.1.3.recipe
@@ -1,19 +1,22 @@
 SUMMARY="X font encoding library"
 DESCRIPTION="libfontenc is a library which helps font libraries \
 portably determine and deal with different encodings of fonts."
-HOMEPAGE="http://www.x.org"
+HOMEPAGE="https://www.x.org/"
 COPYRIGHT="1998-2001 Juliusz Chroboczek"
 LICENSE="MIT (no promotion)"
-REVISION="2"
-SOURCE_URI="https://www.x.org/archive/individual/lib/libfontenc-$portVersion.tar.gz"
-CHECKSUM_SHA256="6fba26760ca8d5045f2b52ddf641c12cedc19ee30939c6478162b7db8b6220fb"
+REVISION="3"
+SOURCE_URI="https://www.x.org/archive/individual/lib/libfontenc-$portVersion.tar.bz2"
+CHECKSUM_SHA256="70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion=1.0.0
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	libfontenc$secondaryArchSuffix = $portVersion
-	lib:libfontenc$secondaryArchSuffix = 1.0.0 compat >= 1
+	lib:libfontenc$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -22,7 +25,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libfontenc${secondaryArchSuffix}_devel = $portVersion
-	devel:libfontenc$secondaryArchSuffix = 1.0.0 compat >= 1
+	devel:libfontenc$secondaryArchSuffix = $libVersion
 	"
 REQUIRES_devel="
 	libfontenc$secondaryArchSuffix == $portVersion base
@@ -30,32 +33,38 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	fontutil$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:xproto$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	devel:util_macros$secondaryArchSuffix
-	cmd:bdftruncate #fontutil
-	cmd:libtool
-	cmd:make
+	cmd:aclocal
+	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage libfontenc$secondaryArchSuffix \
+	$libDir/libfontenc.so.$libVersion
+
 BUILD()
 {
+	autoreconf -vfi
 	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
 
-	rm -rf $libDir/libfontenc.la
+	rm -f $libDir/*.la
 
-	fixPkgconfig
 	prepareInstalledDevelLib libfontenc
+	fixPkgconfig
 
 	# devel package
 	packageEntries devel \