diff --git a/ChangeLog b/ChangeLog
index 567ec3065e..37cdb762ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-25  Eric Blake  <eblake@redhat.com>
+
+	bootstrap: only force latest Makefile.in.in for gettext module
+	* build-aux/bootstrap (with_gettext): Only install latest
+	Makefile.in.in for projects requesting bleeding edge gettext.
+
 2012-04-22  Bruno Haible  <bruno@clisp.org>
 
 	doc: Mention reason for replacement on glibc/Linux systems.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 5aa73cc1b7..6b458689be 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-04-19.22; # UTC
+scriptversion=2012-04-25.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -873,7 +873,15 @@ if test $with_gettext = yes; then
     }
   ' po/Makevars.template >po/Makevars || exit 1
 
-  cat $GNULIB_SRCDIR/build-aux/po/Makefile.in.in > po/Makefile.in.in || exit 1
+  # If the 'gettext' module is in use, grab the latest Makefile.in.in.
+  # If only the 'gettext-h' module is in use, assume autopoint already
+  # put the correct version of this file into place.
+  case $gnulib_modules in
+  *gettext-h*) ;;
+  *gettext*)
+    cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in || exit 1
+    ;;
+  esac
 
   if test -d runtime-po; then
     # Similarly for runtime-po/Makevars, but not quite the same.