diff --git a/ChangeLog b/ChangeLog
index 6cdfd57d7..4b5080ebf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-03  Carles Pina i Estany  <carles@pina.cat>
+
+	* kern/env.c (grub_env_unset): Set the variable to "" if has hooks.
+
 2010-01-03  Carles Pina i Estany  <carles@pina.cat>
 
 	* po/POTFILES: Sort correctly.
diff --git a/kern/env.c b/kern/env.c
index 969227dec..8f94e891e 100644
--- a/kern/env.c
+++ b/kern/env.c
@@ -264,10 +264,11 @@ grub_env_unset (const char *name)
   if (! var)
     return;
 
-  /* XXX: It is not possible to unset variables with a read or write
-     hook.  */
   if (var->read_hook || var->write_hook)
-    return;
+    {
+      grub_env_set (name, "");
+      return;
+    }
 
   grub_env_remove (var);