diff --git a/ChangeLog b/ChangeLog
index 1b56d3d01..13598ad5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-05  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/grub-install.in: Install gettext .mo files.
+	* util/grub-mkrescue.in (process_input_dir): Copy gettext .mo files.
+
 2009-12-05  Carles Pina i Estany  <carles@pina.cat>
 
 	* gettext/gettext.c (grub_gettext_init_ext): Replace grub_printf with
diff --git a/util/grub-install.in b/util/grub-install.in
index 356e161e7..4df620812 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -247,6 +247,14 @@ if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
     done
 fi
 
+# Copy gettext files
+mkdir -p ${grubdir}/locale/
+for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
+    if test -f "$file"; then
+        cp -f "$file" ${grubdir}/locale/
+    fi
+done
+
 # Write device to a variable so we don't have to traverse /dev every time.
 grub_device=`$grub_probe --target=device ${grubdir}`
 
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 51639ccb1..8e4a77f58 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -100,6 +100,13 @@ process_input_dir ()
             cp -f "$file" ${iso9660_dir}/boot/grub/${target_cpu}-${platform}/
         fi
     done
+
+    mkdir -p ${iso9660_dir}/boot/grub/locale
+    for file in ${input_dir}/po/*.mo; do
+        if test -f "$file"; then
+	    cp -f "$file" ${iso9660_dir}/boot/grub/locale/
+	fi
+    done
 }
 
 if [ "${override_dir}" = "" ] ; then