diff --git a/ChangeLog b/ChangeLog
index 28dbecd44..de71948be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-19  Robert Millan  <rmh@aybabtu.com>
+
+	* kern/main.c (grub_main): Export `prefix' variable inmediately
+	after it has been set by grub_machine_set_prefix().
+
 2008-06-19  Robert Millan  <rmh@aybabtu.com>
 
 	* commands/search.c (search_label, search_fs_uuid, search_file): Print
diff --git a/kern/main.c b/kern/main.c
index 09de03ade..5b59d41f4 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -125,6 +125,7 @@ grub_main (void)
   /* It is better to set the root device as soon as possible,
      for convenience.  */
   grub_machine_set_prefix ();
+  grub_env_export ("prefix");
   grub_set_root_dev ();
 
   /* Load the normal mode module.  */