diff --git a/packages/toolchain/devel/autotools/automake/files/gtk-doc.m4 b/packages/devel/automake/files/gtk-doc.m4
similarity index 100%
rename from packages/toolchain/devel/autotools/automake/files/gtk-doc.m4
rename to packages/devel/automake/files/gtk-doc.m4
diff --git a/packages/toolchain/devel/autotools/automake/files/introspection.m4 b/packages/devel/automake/files/introspection.m4
similarity index 100%
rename from packages/toolchain/devel/autotools/automake/files/introspection.m4
rename to packages/devel/automake/files/introspection.m4
diff --git a/packages/toolchain/devel/autotools/automake/meta b/packages/devel/automake/package.mk
similarity index 86%
rename from packages/toolchain/devel/autotools/automake/meta
rename to packages/devel/automake/package.mk
index 248a8a638a..12d3573199 100644
--- a/packages/toolchain/devel/autotools/automake/meta
+++ b/packages/devel/automake/package.mk
@@ -23,12 +23,19 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sources.redhat.com/automake/"
 PKG_URL="http://ftp.gnu.org/gnu/automake/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache:host autoconf"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache:host autoconf:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="automake: A GNU tool for automatically creating Makefiles"
 PKG_LONGDESC="This is Automake, a Makefile generator. It was inspired by the 4.4BSD make and include files, but aims to be portable and to conform to the GNU standards for Makefile variables and targets. Automake is a Perl script. The input files are called Makefile.am. The output files are called Makefile.in; they are intended for use with Autoconf. Automake requires certain things to be done in your configure.in."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME --disable-silent-rules"
+
+post_makeinstall_host() {
+  make prefix=$SYSROOT_PREFIX/usr install
+  cp -P $PKG_DIR/files/*.m4 $SYSROOT_PREFIX/usr/share/aclocal
+}
diff --git a/packages/toolchain/devel/autotools/automake/build b/packages/toolchain/devel/autotools/automake/build
deleted file mode 100755
index 4dcd97b7c5..0000000000
--- a/packages/toolchain/devel/autotools/automake/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 \
-            --target=$TARGET_NAME \
-            --prefix=$ROOT/$TOOLCHAIN \
-            --disable-silent-rules
-
-make
-make install
-make prefix=$SYSROOT_PREFIX/usr install
-cp -P $PKG_DIR/files/*.m4 $SYSROOT_PREFIX/usr/share/aclocal
diff --git a/packages/toolchain/devel/autotools/package.mk b/packages/toolchain/devel/autotools/package.mk
index 39e33fdbfa..91698c5f7d 100644
--- a/packages/toolchain/devel/autotools/package.mk
+++ b/packages/toolchain/devel/autotools/package.mk
@@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS_HOST=""
-PKG_BUILD_DEPENDS_HOST="ccache:host autoconf:host automake libtool:host intltool autoconf-archive:host"
+PKG_BUILD_DEPENDS_HOST="ccache:host autoconf:host automake:host libtool:host intltool autoconf-archive:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="autotools: Metapackage"