diff --git a/packages/devel/autoconf-2.64/package.mk b/packages/devel/autoconf-2.64/package.mk
index d8650104fc..58bb086b5e 100644
--- a/packages/devel/autoconf-2.64/package.mk
+++ b/packages/devel/autoconf-2.64/package.mk
@@ -26,7 +26,7 @@ PKG_SITE="http://sources.redhat.com/autoconf/"
 PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME.tar.bz2"
 PKG_SOURCE_DIR="$PKG_NAME"
 PKG_DEPENDS_HOST=""
-PKG_BUILD_DEPENDS_HOST="ccache:host m4"
+PKG_BUILD_DEPENDS_HOST="ccache:host m4:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code"
diff --git a/packages/devel/autoconf-2.68/package.mk b/packages/devel/autoconf-2.68/package.mk
index 6e3f22047c..8842a08cc4 100644
--- a/packages/devel/autoconf-2.68/package.mk
+++ b/packages/devel/autoconf-2.68/package.mk
@@ -26,7 +26,7 @@ PKG_SITE="http://sources.redhat.com/autoconf/"
 PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME.tar.bz2"
 PKG_SOURCE_DIR="$PKG_NAME"
 PKG_DEPENDS_HOST=""
-PKG_BUILD_DEPENDS_HOST="ccache:host m4"
+PKG_BUILD_DEPENDS_HOST="ccache:host m4:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code"
diff --git a/packages/devel/autoconf/package.mk b/packages/devel/autoconf/package.mk
index d6f6f2e772..4826c8efc9 100644
--- a/packages/devel/autoconf/package.mk
+++ b/packages/devel/autoconf/package.mk
@@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://sources.redhat.com/autoconf/"
 PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_HOST=""
-PKG_BUILD_DEPENDS_HOST="ccache:host m4 gettext:host"
+PKG_BUILD_DEPENDS_HOST="ccache:host m4:host gettext:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code"
diff --git a/packages/toolchain/devel/autotools/m4/meta b/packages/devel/m4/package.mk
similarity index 87%
rename from packages/toolchain/devel/autotools/m4/meta
rename to packages/devel/m4/package.mk
index 194cabd914..e221fba4a6 100644
--- a/packages/toolchain/devel/autotools/m4/meta
+++ b/packages/devel/m4/package.mk
@@ -23,12 +23,18 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="ftp://ftp.gnu.org/pub/gnu/m4/"
 PKG_URL="http://ftp.gnu.org/gnu/m4/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache:host"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache:host"
 PKG_PRIORITY="optional"
-PKG_SECTION="toolchain/devel"
+PKG_SECTION="devel"
 PKG_SHORTDESC="m4: The m4 macro processor"
 PKG_LONGDESC="GNU 'M4' is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible, although it has some extensions (for example, handling more than 9 positional parameters to macros). 'M4' also has built-in functions for including files, running shell commands, doing arithmetic, etc. Autoconf needs GNU 'M4' for generating 'configure' scripts, but not for running them."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_HOST="gl_cv_func_gettimeofday_clobber=no --target=$TARGET_NAME"
+
+post_makeinstall_host() {
+  make prefix=$SYSROOT_PREFIX/usr install
+}
diff --git a/packages/toolchain/devel/autotools/m4/patches/m4-1.4.16-fgets.patch b/packages/devel/m4/patches/m4-1.4.16-fgets.patch
similarity index 100%
rename from packages/toolchain/devel/autotools/m4/patches/m4-1.4.16-fgets.patch
rename to packages/devel/m4/patches/m4-1.4.16-fgets.patch
diff --git a/packages/toolchain/devel/autotools/m4/build b/packages/toolchain/devel/autotools/m4/build
deleted file mode 100755
index a7280dc38c..0000000000
--- a/packages/toolchain/devel/autotools/m4/build
+++ /dev/null
@@ -1,34 +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
-gl_cv_func_gettimeofday_clobber=no \
-./configure --host=$HOST_NAME \
-            --build=$HOST_NAME \
-            --target=$TARGET_NAME \
-            --prefix=$ROOT/$TOOLCHAIN \
-
-make
-make install
-make prefix=$SYSROOT_PREFIX/usr install