diff --git a/ChangeLog b/ChangeLog
index 9883b5f02..fbd2a37db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/grub.d/00_header.in: Fix handling of locale_dir.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Add /usr/share/fonts/unifont/unifont.pcf.gz
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 0048ebed1..0610792c6 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -122,7 +122,9 @@ esac
 
 # Gettext variables and module
 if [ "x${LANG}" != "xC" ] ; then
+    prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir})
   cat << EOF
+set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})
 set locale_dir=${locale_dir}
 set lang=${grub_lang}
 insmod gettext