diff --git a/ChangeLog b/ChangeLog
index 375131965c..a9b7f6c989 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-06-11  Sven Neumann  <sven@gimp.org>
+
+	* autogen.sh: bumped INTLTOOL_REQUIRED_VERSION to 0.35.5. We
+	actually need 0.40.0 on the system where the tarball is rolled,
+	however 0.35.5 should be good enough for almost everyone.
+
+	* configure.in: use IT_PROG_INTLTOOL with minimum version instead
+	of the deprecated AC_PROG_INTLTOOL.
+
+	* Makefile.am (EXTRA_DIST): removed intltool-foo.in files as
+	intltool 0.40.0 does not install these any longer. Removed them
+	from DISTCLEANFILES as well.
+
 2008-06-11  Sven Neumann  <sven@gimp.org>
 
 	* configure.in: removed redundant calls to AC_MSG_RESULT() from
diff --git a/Makefile.am b/Makefile.am
index 452f3f9b25..027ca934a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,20 +70,12 @@ EXTRA_DIST = \
 	config.h.win32		\
 	gimp-zip.in		\
 	gimpdefs.msc		\
-	intltool-extract.in	\
-	intltool-merge.in	\
-	intltool-update.in	\
 	makefile.msc		\
 	mkinstalldirs
 
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-DISTCLEANFILES = \
-	intltool-extract	\
-	intltool-merge		\
-	intltool-update
-
 
 gimpinstall-@GIMP_TOOL_VERSION@:
 	$(LN_S) $(srcdir)/install-sh $(srcdir)/gimpinstall-@GIMP_TOOL_VERSION@
diff --git a/autogen.sh b/autogen.sh
index 58c0b3a1fd..c4cdb56639 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,7 @@ LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
 AUTOCONF_REQUIRED_VERSION=2.54
 AUTOMAKE_REQUIRED_VERSION=1.9.6
 GLIB_REQUIRED_VERSION=2.16.0
-INTLTOOL_REQUIRED_VERSION=0.31
+INTLTOOL_REQUIRED_VERSION=0.35.5
 LIBTOOL_REQUIRED_VERSION=1.5
 
 
diff --git a/configure.in b/configure.in
index 9f4934ce87..3eed4dc653 100644
--- a/configure.in
+++ b/configure.in
@@ -406,7 +406,7 @@ fi
 # language code to ALL_LINGUAS.
 ALL_LINGUAS="ar bg ca ca@valencia cs da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hu hr id is it ja km ko lt mk ms nb ne nl nn oc pa pl pt pt_BR ro ru rw sk sl sr sr@Latn sv tr tt uk vi xh yi zh_CN zh_TW"
 
-AC_PROG_INTLTOOL
+IT_PROG_INTLTOOL(0.35.5)
 AM_GLIB_GNU_GETTEXT