diff --git a/autogen.sh b/autogen.sh
index a298045d3..031f07e7f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,20 +1,63 @@
 #!/bin/sh
 
-# gettextize updates Makefile.am, configure.in
-cp configure.in configure.in.old
-cp Makefile.am Makefile.am.old
-if test "$1" = "--auto" ; then
-    grep -v 'read dummy < /dev/tty' $(which gettextize) | /bin/sh -s -- --copy --force --intl --no-changelog
-else
-    gettextize --copy --force --intl --no-changelog
-fi
-mv Makefile.am.old Makefile.am
-mv configure.in.old configure.in
-libtoolize --automake --force --copy
-aclocal
-# autoheader creates config.h.in needed by autoconf
-autoheader
-# autoconf creates configure
-autoconf
-# automake creates Makefile.in
-automake --add-missing --copy --gnu
+###
+### common stuff
+###
+OK="\\033[70G[\\033[1;32mOK\\033[1;00m]"
+FAIL="\\033[70G[\\033[1;31mFAILED\\033[1;00m]"
+
+AUTOGEN_LOG=autogen.log
+
+err ()
+{
+    echo "-------"
+    echo "Error :"
+    echo "---8<-----------------------------------"
+    cat $AUTOGEN_LOG
+    echo "----------------------------------->8---"
+    exit 1
+}
+
+run ()
+{
+    echo -n "Running \"$@\""
+    eval $@ >$AUTOGEN_LOG 2>&1
+    if [ $? = 0 ] ; then
+	echo -e $OK
+    else
+	echo -e $FAIL
+	err
+    fi
+}
+
+###
+### cleanning part
+###
+#  remove autotools stuff
+run "rm -rf config"
+run "rm -f config.h.in"
+run "rm -f aclocal.m4 configure config.log config.status"
+run "rm -rf autom4te*.cache"
+# remove libtool stuff
+run "rm -f libtool"
+# remove gettext stuff
+run "rm -f ABOUT-NLS"
+run "rm -rf intl"
+
+###
+### configuration part
+###
+# create the config directory
+run "mkdir -p config/m4"
+run "mkdir intl"
+
+# execute autotools cmds
+run "autopoint -f"
+run "libtoolize --automake --force --copy"
+run "aclocal --force -I config/m4"
+run "autoheader"
+run "autoconf"
+run "automake --add-missing --copy --gnu"
+
+# ending
+rm -f $AUTOGEN_LOG
diff --git a/configure.in b/configure.in
index bcc7009b9..bf7e76e01 100644
--- a/configure.in
+++ b/configure.in
@@ -49,7 +49,8 @@ esac
 
 # Gettext
 ALL_LINGUAS="fr es cs hu de ru"
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([use-libtool])
+AM_GNU_GETTEXT_VERSION([0.15])
 
 # Checks for libraries
 AC_CHECK_LIB(ncurses, initscr, LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
diff --git a/weechat/autogen.sh b/weechat/autogen.sh
index a298045d3..031f07e7f 100755
--- a/weechat/autogen.sh
+++ b/weechat/autogen.sh
@@ -1,20 +1,63 @@
 #!/bin/sh
 
-# gettextize updates Makefile.am, configure.in
-cp configure.in configure.in.old
-cp Makefile.am Makefile.am.old
-if test "$1" = "--auto" ; then
-    grep -v 'read dummy < /dev/tty' $(which gettextize) | /bin/sh -s -- --copy --force --intl --no-changelog
-else
-    gettextize --copy --force --intl --no-changelog
-fi
-mv Makefile.am.old Makefile.am
-mv configure.in.old configure.in
-libtoolize --automake --force --copy
-aclocal
-# autoheader creates config.h.in needed by autoconf
-autoheader
-# autoconf creates configure
-autoconf
-# automake creates Makefile.in
-automake --add-missing --copy --gnu
+###
+### common stuff
+###
+OK="\\033[70G[\\033[1;32mOK\\033[1;00m]"
+FAIL="\\033[70G[\\033[1;31mFAILED\\033[1;00m]"
+
+AUTOGEN_LOG=autogen.log
+
+err ()
+{
+    echo "-------"
+    echo "Error :"
+    echo "---8<-----------------------------------"
+    cat $AUTOGEN_LOG
+    echo "----------------------------------->8---"
+    exit 1
+}
+
+run ()
+{
+    echo -n "Running \"$@\""
+    eval $@ >$AUTOGEN_LOG 2>&1
+    if [ $? = 0 ] ; then
+	echo -e $OK
+    else
+	echo -e $FAIL
+	err
+    fi
+}
+
+###
+### cleanning part
+###
+#  remove autotools stuff
+run "rm -rf config"
+run "rm -f config.h.in"
+run "rm -f aclocal.m4 configure config.log config.status"
+run "rm -rf autom4te*.cache"
+# remove libtool stuff
+run "rm -f libtool"
+# remove gettext stuff
+run "rm -f ABOUT-NLS"
+run "rm -rf intl"
+
+###
+### configuration part
+###
+# create the config directory
+run "mkdir -p config/m4"
+run "mkdir intl"
+
+# execute autotools cmds
+run "autopoint -f"
+run "libtoolize --automake --force --copy"
+run "aclocal --force -I config/m4"
+run "autoheader"
+run "autoconf"
+run "automake --add-missing --copy --gnu"
+
+# ending
+rm -f $AUTOGEN_LOG
diff --git a/weechat/configure.in b/weechat/configure.in
index bcc7009b9..bf7e76e01 100644
--- a/weechat/configure.in
+++ b/weechat/configure.in
@@ -49,7 +49,8 @@ esac
 
 # Gettext
 ALL_LINGUAS="fr es cs hu de ru"
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([use-libtool])
+AM_GNU_GETTEXT_VERSION([0.15])
 
 # Checks for libraries
 AC_CHECK_LIB(ncurses, initscr, LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)