diff --git a/autogen.sh b/autogen.sh
index 78779f1..c3d21c8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ test -n "$srcdir" || srcdir=$(dirname "$0")
 test -n "$srcdir" || srcdir=.
 (
   cd "$srcdir" &&
-  AUTOPOINT='intltoolize --automake --copy' autoreconf -fiv -Wall
+  touch config.rpath &&
+  AUTOPOINT='intltoolize --automake --copy' autoreconf -fiv
 ) || exit
-test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode "$@"
\ No newline at end of file
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 1a1ef0e..2c52129 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,6 @@ AC_INIT([spek],[0.7])
 AC_CONFIG_SRCDIR([src/spek.cc])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.11.1 foreign no-dist-gzip dist-xz])
-AM_MAINTAINER_MODE([yes])
 AM_SILENT_RULES([yes])
 
 AC_PROG_CC_C99
@@ -58,8 +57,8 @@ LIBS="$LIBS $WX_LIBS"
 GETTEXT_PACKAGE=spek
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
 AC_SUBST(GETTEXT_PACKAGE)
-AM_GNU_GETTEXT_VERSION([1.11])
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT([external])
 
 AC_CONFIG_FILES([
 	Makefile