diff --git a/ChangeLog b/ChangeLog
index 20499d719..4854630ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Add -fno-builtin-gettext on host if NLS is disabled.
+
 2012-02-19  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* util/grub-mkconfig.in (GRUB_CMDLINE_GNUMACH): Export variable.
diff --git a/configure.ac b/configure.ac
index e70064f75..8535c9a34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,6 +290,10 @@ if test x$grub_cv_apple_cc = xyes ; then
   HOST_CFLAGS="$HOST_CFLAGS -fnested-functions"
 fi
 
+if test x$USE_NLS = xno; then
+  HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext"
+fi
+
 if test "x$cross_compiling" = xyes; then
   AC_MSG_WARN([cannot generate manual pages while cross compiling])
 else