diff --git a/x11-libs/libxi/libxi-1.7.9.recipe b/x11-libs/libxi/libxi-1.7.9.recipe
index c9474066e..b3a577bb4 100644
--- a/x11-libs/libxi/libxi-1.7.9.recipe
+++ b/x11-libs/libxi/libxi-1.7.9.recipe
@@ -6,27 +6,33 @@ independently from the core devices."
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
 COPYRIGHT="1989, 1998 The Open Group"
 LICENSE="MIT (no promotion)"
-REVISION="1"
-SOURCE_URI="https://www.x.org/archive/individual/lib/libXi-$portVersion.tar.gz"
-CHECKSUM_SHA256="463cc5370191404bc0f8a450fdbf6d9159efbbf274e5e0f427a60191fed9cf4b"
+REVISION="2"
+SOURCE_URI="https://www.x.org/archive/individual/lib/libXi-$portVersion.tar.bz2"
+CHECKSUM_SHA256="c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45"
 SOURCE_DIR="libXi-$portVersion"
 
 ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion=6.1.0
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	libxi$secondaryArchSuffix = $portVersion
-	lib:libxi$secondaryArchSuffix = 6.1.0 compat >= 6
+	lib:libxi$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libx11$secondaryArchSuffix
+	lib:libxau$secondaryArchSuffix
+	lib:libxcb$secondaryArchSuffix
+	lib:libxdmcp$secondaryArchSuffix
 	lib:libxext$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	libxi${secondaryArchSuffix}_devel = $portVersion
-	devel:libxi$secondaryArchSuffix = 6.1.0 compat >= 6
+	devel:libxi$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libxi$secondaryArchSuffix == $portVersion base
@@ -34,32 +40,44 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:inputproto$secondaryArchSuffix
-	devel:fixesproto$secondaryArchSuffix
-	devel:kbproto$secondaryArchSuffix
-	devel:libpthread_stubs$secondaryArchSuffix
-	devel:libX11$secondaryArchSuffix
+	docbook_xml_dtd
+	docbook_xsl_stylesheets
+	devel:inputproto
+	devel:fixesproto
+	devel:kbproto
+	devel:libpthread_stubs
+	devel:libx11$secondaryArchSuffix
+	devel:libxau$secondaryArchSuffix
+	devel:libxcb$secondaryArchSuffix
+	devel:libxdmcp$secondaryArchSuffix
 	devel:libxext$secondaryArchSuffix
 	devel:libxfixes$secondaryArchSuffix
-	devel:xextproto$secondaryArchSuffix
-	devel:xproto$secondaryArchSuffix
+	devel:xextproto
+	devel:xorg_sgml_doctools
+	devel:xproto
+	devel:util_macros
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
-	cmd:libtool
 	cmd:aclocal
-	cmd:make
+	#cmd:asciidoc
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:xmlto
+	cmd:xsltproc
 	"
 
+defineDebugInfoPackage libxi$secondaryArchSuffix \
+	$libDir/libXi.so.$libVersion
+
 BUILD()
 {
-	libtoolize --force --copy --install
-	autoreconf -i
+	autoreconf -vfi
 	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()