diff --git a/Makefile.am b/Makefile.am
index 3f904ffde..37538d38e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = gnu
-
 SUBDIRS = lib src data
 
 locale-update:
diff --git a/autogen.sh b/autogen.sh
index 29edb6cb6..1b854d4ea 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,4 +12,4 @@ aclocal --force
 libtoolize --force
 autoconf --force
 autoheader  --force
-automake --add-missing --force-missing --foreign
+automake --add-missing --force-missing
diff --git a/configure.ac b/configure.ac
index 0b902a0eb..79ecfa6c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(Tuxbox-Neutrino,3.7.1)
-AM_INIT_AUTOMAKE([1.0.1 nostdinc])
+AM_INIT_AUTOMAKE([nostdinc foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
 AC_DEFINE(RELEASE_CYCLE, "2.4", [Release cycle information; used in update code])
diff --git a/src/zapit/Makefile.am b/src/zapit/Makefile.am
index 2ec97d007..f801c5ce1 100644
--- a/src/zapit/Makefile.am
+++ b/src/zapit/Makefile.am
@@ -1,4 +1 @@
-AUTOMAKE_OPTIONS = gnu
-
 SUBDIRS = lib src data
-