diff --git a/net-libs/gloox/gloox-1.0.20.recipe b/net-libs/gloox/gloox-1.0.20.recipe
index 263661867..26a6ccd76 100644
--- a/net-libs/gloox/gloox-1.0.20.recipe
+++ b/net-libs/gloox/gloox-1.0.20.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="Rock-solid, full-featured Jabber/XMPP client library, written in cl
 HOMEPAGE="http://camaya.net/gloox/"
 COPYRIGHT="2002-2012 Jakob Schröter"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://camaya.net/download/gloox-$portVersion.tar.bz2"
 CHECKSUM_SHA256="0243086c0f4f0440d6d8e55705f83249a4463a1d75a034be42b5312e8886dea8"
 PATCHES="gloox-1.0.9.patch"
@@ -11,9 +11,12 @@ PATCHES="gloox-1.0.9.patch"
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
+libVersion=17.0.0
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	gloox$secondaryArchSuffix = $portVersion
-	lib:libgloox$secondaryArchSuffix = 17.0.0 compat >= 17
+	lib:libgloox$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -24,8 +27,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	gloox${secondaryArchSuffix}_devel = $portVersion
-	cmd:gloox_config${secondaryArchSuffix}
-	devel:libgloox$secondaryArchSuffix = 17.0.0 compat >= 17
+	cmd:gloox_config$secondaryArchSuffix
+	devel:libgloox$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	gloox$secondaryArchSuffix == $portVersion base
@@ -38,20 +41,21 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
-	cmd:make
 	cmd:libtoolize
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage gloox$secondaryArchSuffix \
+	$libDir/libgloox.so.$libVersion
+
 BUILD()
 {
 	autoreconf -fi
 	runConfigure ./configure
-	make
+	make $jobArgs
 }
 
 INSTALL()
@@ -63,6 +67,8 @@ INSTALL()
 	# prepare development lib links
 	prepareInstalledDevelLib libgloox
 
+	fixPkgconfig
+
 	# devel package
 	packageEntries devel $developDir $binDir
 }