diff --git a/x11-libs/libxi/libxi-1.7.9.recipe b/x11-libs/libxi/libxi-1.7.9.recipe
index 0bdd037ab..245a22084 100644
--- a/x11-libs/libxi/libxi-1.7.9.recipe
+++ b/x11-libs/libxi/libxi-1.7.9.recipe
@@ -6,12 +6,12 @@ independently from the core devices."
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
 COPYRIGHT="1989, 1998 The Open Group"
 LICENSE="MIT (no promotion)"
-REVISION="2"
+REVISION="3"
 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"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 libVersion="6.1.0"
@@ -19,43 +19,36 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	libxi$secondaryArchSuffix = $portVersion
-	lib:libxi$secondaryArchSuffix = $libVersionCompat
+	lib:libXi$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libx11$secondaryArchSuffix
-	lib:libxau$secondaryArchSuffix
-	lib:libxcb$secondaryArchSuffix
-	lib:libxdmcp$secondaryArchSuffix
-	lib:libxext$secondaryArchSuffix
+	lib:libX11$secondaryArchSuffix
+	lib:libXext$secondaryArchSuffix
+	lib:libXfixes$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	libxi${secondaryArchSuffix}_devel = $portVersion
-	devel:libxi$secondaryArchSuffix = $libVersionCompat
+	devel:libXi$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libxi$secondaryArchSuffix == $portVersion base
+	devel:inputproto
+	devel:libX11$secondaryArchSuffix
+	devel:libXext$secondaryArchSuffix
+	devel:libXfixes$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	docbook_xml_dtd
 	docbook_xsl_stylesheets
-	devel:fixesproto
-	devel:inputproto
-	devel:kbproto
-	devel:libpthread_stubs
-	devel:libx11$secondaryArchSuffix
-	devel:libxau$secondaryArchSuffix
-	devel:libxcb$secondaryArchSuffix
-	devel:libxdmcp$secondaryArchSuffix
-	devel:libxext$secondaryArchSuffix
-	devel:libxfixes$secondaryArchSuffix
+	devel:libX11$secondaryArchSuffix
+	devel:libXext$secondaryArchSuffix
+	devel:libXfixes$secondaryArchSuffix
 	devel:util_macros
-	devel:xextproto
 	devel:xorg_sgml_doctools
-	devel:xproto
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
@@ -76,7 +69,7 @@ defineDebugInfoPackage libxi$secondaryArchSuffix \
 BUILD()
 {
 	autoreconf -vfi
-	runConfigure ./configure
+	runConfigure --omit-dirs docDir ./configure --docdir=$developDocDir
 	make $jobArgs
 }
 
@@ -84,6 +77,15 @@ INSTALL()
 {
 	make install
 
+	if [ -z "$secondaryArchSuffix" ]; then
+		install -m 0644 -t "$developDocDir" README
+		maybe_manDir="$manDir"
+	else
+		rm -rf "$manDir"
+		rm -rf "$developDir/documentation"
+		maybe_manDir=
+	fi
+
 	rm -rf $libDir/libXi.la
 
 	fixPkgconfig
@@ -91,5 +93,6 @@ INSTALL()
 
 	# devel package
 	packageEntries devel \
-		$developDir
+		$developDir \
+		${maybe_manDir:+"$maybe_manDir"}
 }