diff --git a/ChangeLog b/ChangeLog
index 4a7459a91..ab33f7db7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-01-28  Neil Jerram  <neil@ossau.uklinux.net>
 
+	* configure.in: Do AM_GNU_GETTEXT_VERSION, so that autoreconf will
+	run autopoint.
+
+	* acinclude.m4 (AM_INTL_SUBDIR): Provide dummy definition, to work
+	around current autoconf/automake/gettext bug.
+
 	* INSTALL: New upstream version.
 
 	* ABOUT-NLS: New upstream version.
diff --git a/acinclude.m4 b/acinclude.m4
index 345e323b3..deae8658f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -308,3 +308,5 @@ else
 fi
 AC_LANG_RESTORE
 ])dnl ACX_PTHREAD
+
+AC_DEFUN([AM_INTL_SUBDIR], [])dnl
diff --git a/configure.in b/configure.in
index d2eca30cc..7ac933132 100644
--- a/configure.in
+++ b/configure.in
@@ -706,6 +706,7 @@ dnl i18n tests
 #fi
 #AC_CHECK_FUNCS([bindtextdomain textdomain])
 AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.16])
 
 ### Some systems don't declare some functions.  On such systems, we
 ### need to at least provide our own K&R-style declarations.