diff --git a/x11-libs/libx11/libx11-1.6.5.recipe b/x11-libs/libx11/libx11-1.6.5.recipe
index c4ad1455d..3ed056135 100644
--- a/x11-libs/libx11/libx11-1.6.5.recipe
+++ b/x11-libs/libx11/libx11-1.6.5.recipe
@@ -66,9 +66,9 @@ COPYRIGHT="2003-2006,2008 Jamey Sharp, Josh Triplett
 	"
 # TODO: check all the licenses in the COPYING file in the next century.
 LICENSE="MIT"
-REVISION="4"
-SOURCE_URI="https://www.x.org/releases/individual/lib/libX11-$portVersion.tar.gz"
-CHECKSUM_SHA256="3abce972ba62620611fab5b404dafb852da3da54e7c287831c30863011d28fb3"
+REVISION="5"
+SOURCE_URI="https://www.x.org/releases/individual/lib/libX11-$portVersion.tar.bz2"
+CHECKSUM_SHA256="4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d"
 SOURCE_DIR="libX11-$portVersion"
 PATCHES="libx11-$portVersion.patchset"
 
@@ -95,41 +95,41 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libx11$secondaryArchSuffix == $portVersion base
-	devel:libxcb$secondaryArchSuffix
-	devel:libxau$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-#	libxcb${secondaryArchSuffix}_devel >= 1.11.1
-	lib:libxcb$secondaryArchSuffix
-	lib:libxau$secondaryArchSuffix
-	devel:util_macros$secondaryArchSuffix
-	devel:xproto$secondaryArchSuffix
-	devel:xtrans$secondaryArchSuffix
-	devel:inputproto$secondaryArchSuffix
-	devel:kbproto$secondaryArchSuffix
-	devel:xcb_proto$secondaryArchSuffix
-	devel:libxslt$secondaryArchSuffix
-	devel:libpthread_stubs$secondaryArchSuffix
-	devel:libxcb$secondaryArchSuffix
+	#docbook_xml_dtd
+	#docbook_xsl_stylesheets
+	devel:inputproto
+	devel:kbproto
+	devel:libpthread_stubs
 	devel:libxau$secondaryArchSuffix
-	devel:xextproto$secondaryArchSuffix
+	devel:libxcb$secondaryArchSuffix
+	devel:util_macros
+	devel:xcb_proto
+	devel:xextproto
+	devel:xorg_sgml_doctools
+	devel:xproto
+	devel:xtrans
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
+	#cmd:xmlto
+	#cmd:xsltproc
 	"
-#cmd:xmlto
+
+defineDebugInfoPackage libx11$secondaryArchSuffix \
+	"$libDir"/libX11.so.6.3.0 \
+	"$libDir"/libX11-xcb.so.1.0.0
 
 BUILD()
 {
-	libtoolize --force --copy --install
-	autoreconf -i
+	autoreconf -vfi
 	# --disable-selective-werror else makekeys does not even reach main()
 	runConfigure ./configure --disable-selective-werror --enable-static=no
 	make $jobArgs