diff --git a/srcpkgs/xz/liblzma-devel.template b/srcpkgs/xz/liblzma-devel.template
index 85bb0c5fa4..62a101bc37 100644
--- a/srcpkgs/xz/liblzma-devel.template
+++ b/srcpkgs/xz/liblzma-devel.template
@@ -1,24 +1,11 @@
 # Template file for 'liblzma-devel'.
 #
-depends="glibc-devel liblzma"
+depends="glibc-devel liblzma>=${version}"
 short_desc="XZ-format compression library - development files"
-long_desc="
- XZ is the successor to the Lempel-Ziv/Markov-chain Algorithm compression
- format, which provides memory-hungry but powerful compression (often better
- than bzip2) and fast, easy decompression.
-
- The native format of liblzma is XZ; it also supports raw (headerless) streams
- and the older LZMA format used by lzma.
-
- This package contains files for development, headers, static libs, etc."
-
 replaces="xz-devel>=0"
 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/liblzma.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/xz/liblzma.template b/srcpkgs/xz/liblzma.template
index 876d5d3e78..f12242a1e3 100644
--- a/srcpkgs/xz/liblzma.template
+++ b/srcpkgs/xz/liblzma.template
@@ -1,19 +1,8 @@
 # Template file for 'liblzma'.
 #
 short_desc="XZ-format compression library"
-long_desc="
- XZ is the successor to the Lempel-Ziv/Markov-chain Algorithm compression
- format, which provides memory-hungry but powerful compression (often better
- than bzip2) and fast, easy decompression.
-
- The native format of liblzma is XZ; it also supports raw (headerless) streams
- and the older LZMA format used by lzma."
-
 replaces="xz<5.0.0"
 
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/liblzma.so* ${DESTDIR}/usr/lib
+do_install() {
+	vmove "usr/lib/*.so*" usr/lib
 }
diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template
index d220d006e2..c0efe36f75 100644
--- a/srcpkgs/xz/template
+++ b/srcpkgs/xz/template
@@ -1,29 +1,13 @@
 # Template file for 'xz'
 pkgname=xz
 version=5.0.4
-revision=2
+revision=3
 conflicts="chroot-xz>=0"
 build_style=gnu-configure
 subpackages="liblzma liblzma-devel"
-short_desc="XZ utilities"
+short_desc="The XZ utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Public domain, GPL-2, GPL-3, LGPL-2.1"
 homepage="http://tukani.org/xz"
 distfiles="http://tukaani.org/xz/xz-${version}.tar.bz2"
 checksum=5cd9b060d3a1ad396b3be52c9b9311046a1c369e6062aea752658c435629ce92
-long_desc="
- LZMA is a general purporse compression algorithm designed by Igor
- Pavlov as part of 7-Zip. It provides high compression ratio while
- keeping the decompression speed fast.
-
- XZ Utils are an attempt to make LZMA compression easy to use on
- free (as in freedom) operating systems. This is achieved by providing
- tools and libraries which are similar to use than the equivalents
- of the most popular existing compression algorithms.
-
- XZ Utils consist of a few relatively separate parts:
-  * xz command line tool has almost identical syntax than gzip
-    and bzip2. It makes LZMA easy for average users, but also
-    provides advanced options to finetune the compression settings.
-  * A few shell scripts make diffing and grepping LZMA compressed
-    files easy. The scripts were adapted from gzip and bzip2."