diff --git a/packages/toolchain/devel/autotools/m4/build b/packages/toolchain/devel/autotools/m4/build
new file mode 100755
index 0000000000..45c8f15087
--- /dev/null
+++ b/packages/toolchain/devel/autotools/m4/build
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+. config/options
+
+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
diff --git a/packages/toolchain/devel/m4/patches/10-m4-include_stat.h-0.1.diff b/packages/toolchain/devel/autotools/m4/patches/10-m4-include_stat.h-0.1.diff
similarity index 100%
rename from packages/toolchain/devel/m4/patches/10-m4-include_stat.h-0.1.diff
rename to packages/toolchain/devel/autotools/m4/patches/10-m4-include_stat.h-0.1.diff
diff --git a/packages/toolchain/devel/m4/url b/packages/toolchain/devel/autotools/m4/url
similarity index 100%
rename from packages/toolchain/devel/m4/url
rename to packages/toolchain/devel/autotools/m4/url
diff --git a/packages/toolchain/devel/m4/build b/packages/toolchain/devel/m4/build
deleted file mode 100755
index 352c6b4fc5..0000000000
--- a/packages/toolchain/devel/m4/build
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-# build for host
-  setup_toolchain host
-
-  cd $BUILD/$1*
-  mkdir -p .objdir-host
-  cd .objdir-host
-
-  gl_cv_func_gettimeofday_clobber=no \
-  ../configure --host=$HOST_NAME \
-               --build=$HOST_NAME \
-               --target=$TARGET_NAME \
-               --prefix=$ROOT/$TOOLCHAIN \
-
-  make
-  make install
-
-  cd $ROOT
-
-# build for target
-  setup_toolchain target
-
-  cd $BUILD/$1*
-  mkdir -p .objdir-target
-  cd .objdir-target
-
-  gl_cv_func_gettimeofday_clobber=no \
-  ../configure --host=$TARGET_NAME \
-               --build=$HOST_NAME \
-               --prefix=$SYSROOT_PREFIX/usr \
-
-  make
-  make install