diff --git a/x11-libs/libxfont/libxfont-1.5.4.recipe b/x11-libs/libxfont/libxfont-1.5.4.recipe
index c79fe4483..6d3e5c5c0 100644
--- a/x11-libs/libxfont/libxfont-1.5.4.recipe
+++ b/x11-libs/libxfont/libxfont-1.5.4.recipe
@@ -1,8 +1,10 @@
-SUMMARY="X Font rasterisation library"
-DESCRIPTION="libxfont provides an X Window System client interface to \
-the RandR extension to the X protocol. \
-The RandR extension allows for run-time configuration of display attributes \
-such as resolution, rotation, and reflection."
+SUMMARY="X Font handling system"
+DESCRIPTION="libXfont provides the core of the legacy X11 font system, handling the \
+index files (fonts.dir, fonts.alias, fonts.scale), the various font file \
+formats, and rasterizing them.   It is used by the X servers, the \
+X Font Server (xfs), and some font utilities (bdftopcf for instance), \
+but should not be used by normal X11 clients.  X11 clients access fonts \
+via either the new API's in libXft, or the legacy API's in libX11."
 HOMEPAGE="https://www.x.org/releases/individual/lib/"
 COPYRIGHT="2000, Compaq Computer Corporation.
 	2002 Hewlett-Packard Company, Inc.
diff --git a/x11-libs/libxfont/libxfont2-2.0.5.recipe b/x11-libs/libxfont/libxfont2-2.0.5.recipe
new file mode 100644
index 000000000..5db56bf18
--- /dev/null
+++ b/x11-libs/libxfont/libxfont2-2.0.5.recipe
@@ -0,0 +1,97 @@
+SUMMARY="X Font handling system"
+DESCRIPTION="libXfont provides the core of the legacy X11 font system, handling the \
+index files (fonts.dir, fonts.alias, fonts.scale), the various font file \
+formats, and rasterizing them.   It is used by the X servers, the \
+X Font Server (xfs), and some font utilities (bdftopcf for instance), \
+but should not be used by normal X11 clients.  X11 clients access fonts \
+via either the new API's in libXft, or the legacy API's in libX11."
+HOMEPAGE="https://www.x.org/releases/individual/lib/"
+COPYRIGHT="2000, Compaq Computer Corporation.
+	2002 Hewlett-Packard Company, Inc.
+	2006 Intel Corporation
+	2008 Red Hat, Inc.
+	2011 Dave Airlie
+	2006 Keith Packard"
+LICENSE="MIT (no promotion)"
+REVISION="1"
+SOURCE_URI="https://www.x.org/releases/individual/lib/libXfont2-$portVersion.tar.bz2"
+CHECKSUM_SHA256="aa7c6f211cf7215c0ab4819ed893dc98034363d7b930b844bb43603c2e10b53e"
+SOURCE_DIR="libXfont2-$portVersion"
+
+ARCHITECTURES="all"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="2.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	libxfont2$secondaryArchSuffix = $portVersion
+	lib:libXfont2$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libfontenc$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libxfont2${secondaryArchSuffix}_devel = $portVersion
+	devel:libXfont2$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	libxfont2$secondaryArchSuffix == $portVersion base
+	devel:fontsproto
+	devel:libfontenc$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:xproto
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	docbook_xml_dtd
+	docbook_xsl_stylesheets
+	devel:fontsproto
+	devel:libfontenc$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:util_macros
+	devel:xorg_sgml_doctools
+	devel:xproto
+	devel:xtrans
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:xmlto
+	"
+
+defineDebugInfoPackage libxfont$secondaryArchSuffix \
+	$libDir/libXfont2.so.$libVersion
+
+BUILD()
+{
+	export LDFLAGS="-lnetwork -lbsd"
+
+	autoreconf -vfi
+	runConfigure ./configure --disable-selective-werror
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm -f $libDir/*.la
+
+	prepareInstalledDevelLib libXfont2
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}