diff --git a/Makefile.am b/Makefile.am
index 03accc1..f488138 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = \
 	src	\
 	po	\
diff --git a/autogen.sh b/autogen.sh
index 13b1708..6c6672c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,6 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="zenity"
-REQUIRED_AUTOMAKE_VERSION=1.9
 
 (test -f $srcdir/configure.in \
   && test -f $srcdir/ChangeLog \
@@ -17,7 +16,7 @@ REQUIRED_AUTOMAKE_VERSION=1.9
 
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
+    echo "You need to install gnome-common"
     exit 1
 }
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
+. gnome-autogen.sh
diff --git a/configure.in b/configure.in
index f4e5ead..3cff53e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,21 +1,17 @@
 AC_INIT([Zenity],[2.91.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity])
 
-AC_PREREQ([2.59])
+AC_PREREQ([2.63])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src])
+AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2 no-dist-gzip])
+AM_MAINTAINER_MODE([enable])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-GNOME_COMMON_INIT
-GNOME_DOC_INIT
-
-AM_MAINTAINER_MODE
-
-IT_PROG_INTLTOOL([0.40.0])
-
+# Check for programs
 AC_PROG_CC
 
 GTK_REQUIRED=2.91.0
@@ -65,7 +61,9 @@ AC_PATH_PROG([PERL],[perl],)
 LIBNOTIFY_REQUIRED=0.6.1
 
 AC_ARG_ENABLE([libnotify],
-              AC_HELP_STRING([--enable-libnotify], [enable libnotify support]),,
+              [AS_HELP_STRING([--enable-libnotify],
+                              [Enable libnotify support])],
+              [],
               [enable_libnotify=yes])
 
 if test x$enable_libnotify = xyes; then
@@ -88,6 +86,7 @@ GNOME_COMPILE_WARNINGS([maximum])
 # *******************************
 # Internationalization
 # ******************************* 
+IT_PROG_INTLTOOL([0.40.0])
 
 GETTEXT_PACKAGE=zenity
 AC_SUBST([GETTEXT_PACKAGE])
@@ -95,6 +94,11 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain])
 
 AM_GLIB_GNU_GETTEXT
 
+# *******************************
+# User manual
+# *******************************
+GNOME_DOC_INIT
+
 # *******************************
 
 AC_SUBST([AM_CPPFLAGS])
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..a8b28ea
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,2 @@
+gnome-doc-utils.m4
+intltool.m4