diff --git a/ChangeLog b/ChangeLog
index a1bfc3ef7..fbfefad82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* util/grub-install.in: Use mkdir -p to create grub directory.
+	* util/i386/efi/grub-install.in: Likewise.
+	* util/ieee1275/grub-install.in: Likewise.
+
 2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* Makefile.in (LEX): new variable.
diff --git a/util/grub-install.in b/util/grub-install.in
index a1671b200..790b56ff6 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -219,8 +219,7 @@ else
 fi
 
 # Create the GRUB directory if it is not present.
-test -d "$bootdir" || mkdir "$bootdir" || exit 1
-test -d "$grubdir" || mkdir "$grubdir" || exit 1
+mkdir -p "$grubdir" || exit 1
 
 # If --recheck is specified, remove the device map, if present.
 if test $recheck = yes; then
diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index 2e9b0ca39..cc4d950d2 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -145,8 +145,7 @@ else
 fi
 
 # Create the GRUB directory if it is not present.
-test -d "$bootdir" || mkdir "$bootdir" || exit 1
-test -d "$grubdir" || mkdir "$grubdir" || exit 1
+mkdir -p "$grubdir" || exit 1
 
 # If --recheck is specified, remove the device map, if present.
 if test $recheck = yes; then
diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index be4053542..363f312db 100644
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -141,8 +141,7 @@ fi
 # XXX warn on firmware-unreadable filesystems?
 
 # Create the GRUB directory if it is not present.
-test -d "$bootdir" || mkdir "$bootdir" || exit 1
-test -d "$grubdir" || mkdir "$grubdir" || exit 1
+mkdir -p "$grubdir" || exit 1
 
 # Create the device map file if it is not present.
 if test -f "$device_map"; then