diff --git a/configure.in b/configure.in
index ff1a8fd..b2f01a4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,14 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(configure.in)
-
-PACKAGE=Xdialog
-VERSION=2.3.1
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
+AC_INIT([Xdialog], [2.3.1])
+AC_CONFIG_SRCDIR([configure.in])
+
+AM_INIT_AUTOMAKE
 
 AM_CONFIG_HEADER(config.h)
 
@@ -18,6 +19,7 @@ AC_CHECK_FUNCS(strcasecmp strstr getopt_long_only memchr memmove setlocale)
 rm -f ./intl/libintl.h
 ALL_LINGUAS="fr de ru es hu pt_BR no_NO id nl it pl ca sv_SE"
 AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.21])
 
 compile_for="gtk1"
 AC_ARG_WITH(gtk2,