diff --git a/x11-libs/libxinerama/libxinerama-1.1.3.recipe b/x11-libs/libxinerama/libxinerama-1.1.4.recipe
similarity index 59%
rename from x11-libs/libxinerama/libxinerama-1.1.3.recipe
rename to x11-libs/libxinerama/libxinerama-1.1.4.recipe
index 14b5cf2ef..ec6168923 100644
--- a/x11-libs/libxinerama/libxinerama-1.1.3.recipe
+++ b/x11-libs/libxinerama/libxinerama-1.1.4.recipe
@@ -2,20 +2,24 @@ SUMMARY="API for Xinerama extension to X11 Protocol"
 DESCRIPTION="Xinerama is a simple library designed to interface the Xinerama \
 Extension for retrieving information about physical output devices which may \
 be combined into a single logical X screen."
-HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
+HOMEPAGE="https://cgit.freedesktop.org/xorg/lib/libXinerama
+	https://xorg.freedesktop.org/releases/individual/lib/"
 COPYRIGHT="2007 Oracle"
 LICENSE="MIT (no promotion)"
-REVISION="2"
-SOURCE_URI="https://www.x.org/archive/individual/lib/libXinerama-$portVersion.tar.gz"
-CHECKSUM_SHA256="0ba243222ae5aba4c6a3d7a394c32c8b69220a6872dbb00b7abae8753aca9a44"
+REVISION="1"
+SOURCE_URI="https://www.x.org/archive/individual/lib/libXinerama-$portVersion.tar.bz2"
+CHECKSUM_SHA256="0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720"
 SOURCE_DIR="libXinerama-$portVersion"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+libVersion="1.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	libxinerama$secondaryArchSuffix = $portVersion
-	lib:libxinerama$secondaryArchSuffix = 1.0.0 compat >= 1
+	lib:libxinerama$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -25,7 +29,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libxinerama${secondaryArchSuffix}_devel = $portVersion
-	devel:libxinerama$secondaryArchSuffix = 1.0.0 compat >= 1
+	devel:libxinerama$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libxinerama$secondaryArchSuffix == $portVersion base
@@ -42,19 +46,20 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	devel:util_macros$secondaryArchSuffix
-	cmd:autoconf
-	cmd:libtool
 	cmd:aclocal
-	cmd:make
+	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage libxinerama$secondaryArchSuffix \
+	"$libDir"/libXinerama.so.$libVersion
+
 BUILD()
 {
-	libtoolize --force --copy --install
-	autoreconf -i
 	runConfigure ./configure
 }
 
@@ -62,12 +67,27 @@ INSTALL()
 {
 	make install
 
-	rm -rf $libDir/libXinerama.la
+	if [ -z "$secondaryArchSuffix" ]; then
+		install -m 0755 -d "$developDocDir"
+		install -m 0644 -t "$developDocDir" README
+		maybe_manDir="$manDir"
+	else
+		rm -rf "$manDir"
+		maybe_manDir=
+	fi
+
+	rm -f "$libDir"/libXinerama.la
 
-	fixPkgconfig
 	prepareInstalledDevelLib libXinerama
+	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
-		$developDir
+		"$developDir" \
+		${maybe_manDir:+"$maybe_manDir"}
+}
+
+TEST()
+{
+	make check
 }