diff --git a/packages/toolchain/archivers/xz/meta b/packages/compress/xz/package.mk
similarity index 84%
rename from packages/toolchain/archivers/xz/meta
rename to packages/compress/xz/package.mk
index 182831faa7..c501d390a3 100644
--- a/packages/toolchain/archivers/xz/meta
+++ b/packages/compress/xz/package.mk
@@ -23,12 +23,18 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://tukaani.org/xz/"
 PKG_URL="http://tukaani.org/xz/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/archivers"
 PKG_SHORTDESC="xz: a free general-purpose data compression software with high compression ratio."
 PKG_LONGDESC="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."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_HOST="--disable-lzmadec \
+                         --disable-lzmainfo \
+                         --enable-lzma-links \
+                         --disable-scripts \
+                         --disable-nls"
diff --git a/packages/toolchain/archivers/xz/build b/packages/toolchain/archivers/xz/build
deleted file mode 100755
index 1eea5f0bd1..0000000000
--- a/packages/toolchain/archivers/xz/build
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-setup_toolchain host
-
-cd $PKG_BUILD
-./configure --host=$HOST_NAME \
-            --build=$HOST_NAME \
-            --prefix=$ROOT/$TOOLCHAIN \
-            --disable-lzmadec \
-            --disable-lzmainfo \
-            --enable-lzma-links \
-            --disable-scripts \
-            --disable-nls
-make
-make install
diff --git a/packages/toolchain/meta b/packages/toolchain/meta
index 973e57aa96..217c826bd6 100644
--- a/packages/toolchain/meta
+++ b/packages/toolchain/meta
@@ -24,8 +24,8 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-#PKG_BUILD_DEPENDS="make xz sed:host pkg-config autotools gcc-final bison:host flex cmake jam scons yasm nasm"
-PKG_BUILD_DEPENDS="make:host xz sed:host pkg-config autotools gcc:host bison:host flex cmake scons yasm nasm"
+#PKG_BUILD_DEPENDS="make xz:host sed:host pkg-config autotools gcc-final bison:host flex cmake jam scons yasm nasm"
+PKG_BUILD_DEPENDS="make:host xz:host sed:host pkg-config autotools gcc:host bison:host flex cmake scons yasm nasm"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"