diff --git a/ChangeLog b/ChangeLog
index 11db1ef2e..77f879d8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkrescue.in: Fix locale directory.
+
 2012-04-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/hostdisk.c (map): Make static.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 491aec7df..6210e7ba3 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -52,6 +52,8 @@ xorriso=xorriso
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"
 
+localedir="@datadir@/locale"
+
 . "${pkgdatadir}/grub-mkconfig_lib"
 
 # Usage: usage
@@ -182,9 +184,9 @@ process_input_dir ()
     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/
+    for dir in "${localedir}"/*; do
+	if test -f "$dir/LC_MESSAGES/grub.mo"; then
+            cp -f "$dir/LC_MESSAGES/grub.mo" "${iso9660_dir}/boot/grub/locale/${dir##*/}.mo"
 	fi
     done
 }