diff --git a/app-arch/xz_utils/xz_utils-5.0.5.recipe b/app-arch/xz_utils/xz_utils-5.0.5.recipe
index 1ca81ce47..0e86ee2a8 100644
--- a/app-arch/xz_utils/xz_utils-5.0.5.recipe
+++ b/app-arch/xz_utils/xz_utils-5.0.5.recipe
@@ -1,14 +1,27 @@
-SUMMARY="Free general-purpose data compression software"
+SUMMARY="Free general-purpose data compression software."
+DESCRIPTION="XZ Utils are free general-purpose data compression tools with \
+a high compression ratio. They are the successors to LZMA Utils.
+
+The core of the XZ Utils compression code is based on LZMA SDK, but it has \
+been modified quite a lot to be suitable for XZ Utils. The primary compression \
+algorithm is currently LZMA2, which is used inside the \".xz\" container format. \
+With typical files, XZ Utils create 30% smaller output than GZip and 15% \
+smaller output than BZip2.
+XZ Utils consists of several components:
+ * liblzma, a compression library with API similar to that of zlib.
+ * xz, a command line tool with syntax similar to that of GZip.
+ * xzdec, a decompression-only tool smaller than the full-featured xz tool.
+ * A set of shell scripts (xzgrep, xzdiff, etc.) adapted from GZip to \
+ease the viewing, grepping, and comparing of compressed files."
 HOMEPAGE="http://tukaani.org/xz/"
 SRC_URI="http://tukaani.org/xz/xz-5.0.5.tar.bz2"
 CHECKSUM_SHA256="166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490"
-LICENSE="
-	GNU LGPL v2.1
+SOURCE_DIR="xz-$portVersion"
+LICENSE="GNU LGPL v2.1
 	GNU GPL v2
-	GNU GPL v3
-	"
+	GNU GPL v3"
 COPYRIGHT="2005-2013 Lasse Collin"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -55,11 +68,12 @@ PROVIDES="
 	cmd:xzless$commandSuffix = $portVersion compat >= 5
 	cmd:xzmore$commandSuffix = $portVersion compat >= 5
 	lib:liblzma$secondaryArchSuffix = $portVersion compat >= 5
-	devel:liblzma$secondaryArchSuffix = $portVersion compat >= 5
 	"
+
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	"
+
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
@@ -69,8 +83,14 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
+	
+PROVIDES_devel="
+	devel:liblzma$secondaryArchSuffix = $portVersion compat >= 5
+	"
 
-SOURCE_DIR="xz-$portVersion"
+REQUIRES_devel="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
 
 BUILD()
 {
@@ -82,39 +102,19 @@ BUILD()
 INSTALL()
 {
 	make install
+	fixPkgconfig
 
 	expanderRulesDir=$dataDir/expander/rules
 	mkdir -p $expanderRulesDir
 	cp "$portDir/additional-files/xz_utils-expander-rules" \
 		"$expanderRulesDir/xz_utils"
 
-	fixPkgconfig liblzma
 	prepareInstalledDevelLibs liblzma
+	packageEntries devel \
+		$developDir
 }
 
 TEST()
 {
 	make check
 }
-
-DESCRIPTION="
-XZ Utils is free general-purpose data compression software with high \
-compression ratio. XZ Utils were written for POSIX-like systems, but also work \
-on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils.
-The core of the XZ Utils compression code is based on LZMA SDK, but it has \
-been modified quite a lot to be suitable for XZ Utils. The primary compression \
-algorithm is currently LZMA2, which is used inside the .xz container format. \
-With typical files, XZ Utils create 30 % smaller output than gzip and 15 % \
-smaller output than bzip2.
-XZ Utils consist of several components:
-* liblzma is a compression library with API similar to that of zlib.
-* xz is a command line tool with syntax similar to that of gzip.
-* xzdec is a decompression-only tool smaller than the full-featured xz tool.
-* A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to \
-ease viewing, grepping, and comparing compressed files.
-* Emulation of command line tools of LZMA Utils eases transition from LZMA \
-Utils to XZ Utils.
-While liblzma has a zlib-like API, liblzma doesn't include any file I/O \
-functions. A separate I/O library is planned, which would abstract handling of \
-.gz, .bz2, and .xz files with an easy to use API.
-"