diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a8ff00d..8798b8f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
  2012-08-16   Diego Novillo  <dnovillo@google.com>

+       PR bootstrap/54281
+       * intl.h: Prevent libintl.h from being included when
+       ENABLE_NLS is not set.
+
+2012-08-16   Diego Novillo  <dnovillo@google.com>
+
         Revert

         PR bootstrap/54281
diff --git a/gcc/intl.h b/gcc/intl.h
index c4db354..e10e357 100644
--- a/gcc/intl.h
+++ b/gcc/intl.h
@@ -32,6 +32,11 @@
  extern void gcc_init_libintl (void);
  extern size_t gcc_gettext_width (const char *);
  #else
+/* Prevent libintl.h from being included, since we are truncating
+   some functions (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54281).  */
+# ifndef _LIBINTL_H
+# define _LIBINTL_H 1
+# endif
  /* Stubs.  */
  # undef textdomain
  # define textdomain(domain) (domain)