diff --git a/debian/changelog b/debian/changelog
index 420626d43..2587ef17f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,7 @@ grub2 (2.00-1) UNRELEASED; urgency=low
   * Backport from upstream:
     - Don't decrease efi_mmap_size (LP: #1046429).
   * grub-common Suggests: console-setup for grub-kbdcomp (closes: #686815).
+  * Silence error messages when translations are unavailable.
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 02 Jun 2012 19:51:35 +0200
 
diff --git a/debian/patches/gettext_quiet.patch b/debian/patches/gettext_quiet.patch
new file mode 100644
index 000000000..688f33a04
--- /dev/null
+++ b/debian/patches/gettext_quiet.patch
@@ -0,0 +1,25 @@
+Description: Silence error messages when translations are unavailable
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug: https://savannah.gnu.org/bugs/?35880
+Forwarded: https://savannah.gnu.org/bugs/?35880
+Last-Update: 2012-09-06
+
+Index: b/grub-core/gettext/gettext.c
+===================================================================
+--- a/grub-core/gettext/gettext.c
++++ b/grub-core/gettext/gettext.c
+@@ -412,6 +412,14 @@
+ 
+       grub_free (lang);
+     }
++
++  /* If no translations are available, fall back to untranslated text. */
++  if (err == GRUB_ERR_FILE_NOT_FOUND)
++    {
++      grub_errno = GRUB_ERR_NONE;
++      return 0;
++    }
++
+   return err;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 39991fb40..fcc80867b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ mkconfig_loopback.patch
 efi_disk_cache.patch
 restore_mkdevicemap.patch
 efi_mmap_size.patch
+gettext_quiet.patch
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
index 569f98532..eb4bb5d1b 100644
--- a/grub-core/gettext/gettext.c
+++ b/grub-core/gettext/gettext.c
@@ -412,6 +412,14 @@ grub_gettext_init_ext (struct grub_gettext_context *ctx,
 
       grub_free (lang);
     }
+
+  /* If no translations are available, fall back to untranslated text. */
+  if (err == GRUB_ERR_FILE_NOT_FOUND)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return 0;
+    }
+
   return err;
 }