diff --git a/packages/toolchain/archivers/cpio/meta b/packages/compress/cpio/package.mk
similarity index 96%
rename from packages/toolchain/archivers/cpio/meta
rename to packages/compress/cpio/package.mk
index bee1019b06..92e657b42f 100644
--- a/packages/toolchain/archivers/cpio/meta
+++ b/packages/compress/cpio/package.mk
@@ -23,12 +23,12 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/cpio/cpio.html"
 PKG_URL="http://ftp.gnu.org/gnu/cpio/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="compress"
 PKG_SHORTDESC="cpio: A GNU archiving program"
 PKG_LONGDESC="This is GNU cpio, a program to manage archives of files. As of version 2.0, it supports the features of the System V release 4 cpio, including support for tar archives."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
diff --git a/packages/toolchain/archivers/cpio/patches/cpio-2.11-fgets.patch b/packages/compress/cpio/patches/cpio-2.11-fgets.patch
similarity index 100%
rename from packages/toolchain/archivers/cpio/patches/cpio-2.11-fgets.patch
rename to packages/compress/cpio/patches/cpio-2.11-fgets.patch
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 7149e6071f..d0817f28e7 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -34,7 +34,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS_TARGET="busybox linux-drivers linux-firmware pciutils $BOOTLOADER"
 PKG_BUILD_DEPENDS_HOST="ccache"
-PKG_BUILD_DEPENDS_TARGET="toolchain cpio kmod:host pciutils xz wireless-regdb"
+PKG_BUILD_DEPENDS_TARGET="toolchain cpio:host kmod:host pciutils xz wireless-regdb"
 PKG_BUILD_DEPENDS_INIT="toolchain"
 PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
diff --git a/packages/toolchain/archivers/cpio/build b/packages/toolchain/archivers/cpio/build
deleted file mode 100755
index f79af04118..0000000000
--- a/packages/toolchain/archivers/cpio/build
+++ /dev/null
@@ -1,31 +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
-
-make
-make install