diff --git a/packages/audio/lame/patches/lame-3.99.5-automake.patch b/packages/audio/lame/patches/lame-3.99.5-automake.patch
new file mode 100644
index 0000000000..4645a58c18
--- /dev/null
+++ b/packages/audio/lame/patches/lame-3.99.5-automake.patch
@@ -0,0 +1,46 @@
+diff -Naur lame-3.99.5/configure.in lame-3.99.5.patch/configure.in
+--- lame-3.99.5/configure.in	2012-02-28 19:50:27.000000000 +0100
++++ lame-3.99.5.patch/configure.in	2012-06-13 18:26:00.741781534 +0200
+@@ -77,9 +77,6 @@
+ 	AC_MSG_RESULT(${GCC_version})
+ fi
+ 
+-dnl more automake stuff
+-AM_C_PROTOTYPES
+-
+ AC_CHECK_HEADER(dmalloc.h)
+ if test "${ac_cv_header_dmalloc_h}" = "yes"; then
+ 	AM_WITH_DMALLOC
+diff -Naur lame-3.99.5/doc/html/Makefile.am lame-3.99.5.patch/doc/html/Makefile.am
+--- lame-3.99.5/doc/html/Makefile.am	2010-09-30 22:58:40.000000000 +0200
++++ lame-3.99.5.patch/doc/html/Makefile.am	2012-06-13 18:28:01.586276747 +0200
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ docdir = $(datadir)/doc
+ pkgdocdir = $(docdir)/$(PACKAGE)
+diff -Naur lame-3.99.5/doc/man/Makefile.am lame-3.99.5.patch/doc/man/Makefile.am
+--- lame-3.99.5/doc/man/Makefile.am	2000-10-22 13:39:44.000000000 +0200
++++ lame-3.99.5.patch/doc/man/Makefile.am	2012-06-13 18:27:52.160085394 +0200
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ man_MANS = lame.1
+ EXTRA_DIST = ${man_MANS}
+diff -Naur lame-3.99.5/libmp3lame/i386/Makefile.am lame-3.99.5.patch/libmp3lame/i386/Makefile.am
+--- lame-3.99.5/libmp3lame/i386/Makefile.am	2011-04-04 11:42:34.000000000 +0200
++++ lame-3.99.5.patch/libmp3lame/i386/Makefile.am	2012-06-13 18:27:23.761463827 +0200
+@@ -1,7 +1,5 @@
+ ## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
+-
+ DEFS = @DEFS@ @CONFIG_DEFS@
+ 
+ ECHO ?= echo
diff --git a/packages/audio/libcdio/patches/libcdio-0.83-automake.patch b/packages/audio/libcdio/patches/libcdio-0.83-automake.patch
new file mode 100644
index 0000000000..86be4a755d
--- /dev/null
+++ b/packages/audio/libcdio/patches/libcdio-0.83-automake.patch
@@ -0,0 +1,12 @@
+diff -Naur libcdio-0.83/src/cd-paranoia/doc/ja/Makefile.am libcdio-0.83.patch/src/cd-paranoia/doc/ja/Makefile.am
+--- libcdio-0.83/src/cd-paranoia/doc/ja/Makefile.am	2008-11-29 05:52:43.000000000 +0100
++++ libcdio-0.83.patch/src/cd-paranoia/doc/ja/Makefile.am	2012-06-13 17:50:45.487977958 +0200
+@@ -24,7 +24,7 @@
+ 
+ install-man1: $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(mandir)$(mansubdir)"
++	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(mandir)$(mansubdir)"
+ 	@list='$(man1_MANS)'; \
+ 	l2='$(man_MANS)'; for i in $$l2; do \
+ 	  case "$$i" in \
diff --git a/packages/devel/gmp/patches/gmp-5.0.5-automake.patch b/packages/devel/gmp/patches/gmp-5.0.5-automake.patch
new file mode 100644
index 0000000000..2d97204360
--- /dev/null
+++ b/packages/devel/gmp/patches/gmp-5.0.5-automake.patch
@@ -0,0 +1,34 @@
+diff -Naur gmp-5.0.5/configure.in gmp-5.0.5.patch/configure.in
+--- gmp-5.0.5/configure.in	2012-05-06 13:19:49.000000000 +0200
++++ gmp-5.0.5.patch/configure.in	2012-06-13 21:12:33.434790721 +0200
+@@ -65,7 +65,7 @@
+ dnl  Note that there's a copy of these options in the top-level Makefile.am,
+ dnl  so update there too if changing anything.
+ dnl
+-AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr])
++AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
+ AM_CONFIG_HEADER(config.h:config.in)
+ AM_MAINTAINER_MODE
+ 
+@@ -2228,9 +2228,6 @@
+ echo "      MPN_PATH=\"$path\""
+ 
+ 
+-# Automake ansi2knr support.
+-AM_C_PROTOTYPES
+-
+ CL_AS_NOEXECSTACK
+ 
+ GMP_PROG_AR
+diff -Naur gmp-5.0.5/Makefile.am gmp-5.0.5.patch/Makefile.am
+--- gmp-5.0.5/Makefile.am	2012-05-06 13:19:49.000000000 +0200
++++ gmp-5.0.5.patch/Makefile.am	2012-06-13 21:12:57.038224241 +0200
+@@ -25,7 +25,7 @@
+ # Makefiles in subdirectories, but here we must omit it so automake gives
+ # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr".
+ #
+-AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
++AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies
+ 
+ 
+ # Libtool -version-info for libgmp.la and libmp.la.  See "Versioning" in the
diff --git a/packages/toolchain/devel/autotools/automake/meta b/packages/toolchain/devel/autotools/automake/meta
index 00996bbba9..8b98c6d804 100644
--- a/packages/toolchain/devel/autotools/automake/meta
+++ b/packages/toolchain/devel/autotools/automake/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="automake"
-PKG_VERSION="1.11.5"
+PKG_VERSION="1.12.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/toolchain/math/cloog/patches/cloog-0.17.0-automake.patch b/packages/toolchain/math/cloog/patches/cloog-0.17.0-automake.patch
new file mode 100644
index 0000000000..9475952856
--- /dev/null
+++ b/packages/toolchain/math/cloog/patches/cloog-0.17.0-automake.patch
@@ -0,0 +1,12 @@
+diff -Naur cloog-0.17.0/Makefile.am cloog-0.17.0.patch/Makefile.am
+--- cloog-0.17.0/Makefile.am	2011-12-08 12:03:08.000000000 +0100
++++ cloog-0.17.0.patch/Makefile.am	2012-06-13 14:05:03.611679108 +0200
+@@ -145,7 +145,7 @@
+ 	examples
+ 
+ install-data-local:
+-	@test -z "$(pkgconfig_libdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfig_libdir)"
++	@test -z "$(pkgconfig_libdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfig_libdir)"
+ 	$(INSTALL_DATA) $(pkgconfig_libfile) "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
+ 
+ uninstall-local:
diff --git a/packages/toolchain/math/mpfr/patches/mpfr-3.1.0-01-automake.patch b/packages/toolchain/math/mpfr/patches/mpfr-3.1.0-01-automake.patch
new file mode 100644
index 0000000000..e9eb9cc33b
--- /dev/null
+++ b/packages/toolchain/math/mpfr/patches/mpfr-3.1.0-01-automake.patch
@@ -0,0 +1,23 @@
+diff -Naur mpfr-3.1.0/configure.ac mpfr-3.1.0.patch/configure.ac
+--- mpfr-3.1.0/configure.ac	2011-10-03 10:17:15.000000000 +0200
++++ mpfr-3.1.0.patch/configure.ac	2012-06-13 11:44:03.396985843 +0200
+@@ -301,7 +301,6 @@
+ fi
+ 
+ AM_PROG_CC_C_O
+-AM_C_PROTOTYPES
+ 
+ case $host in
+   *-apple-darwin*)
+diff -Naur mpfr-3.1.0/tests/Makefile.am mpfr-3.1.0.patch/tests/Makefile.am
+--- mpfr-3.1.0/tests/Makefile.am	2011-10-03 10:17:14.000000000 +0200
++++ mpfr-3.1.0.patch/tests/Makefile.am	2012-06-13 12:47:50.874799018 +0200
+@@ -9,7 +9,7 @@
+ # PARTICULAR PURPOSE.
+ 
+ 
+-AUTOMAKE_OPTIONS = 1.6 gnu $(top_builddir)/ansi2knr
++AUTOMAKE_OPTIONS = 1.6 gnu
+ 
+ # tversion is run
+ #   * at the beginning so that the user gets a possible version error