diff --git a/ChangeLog b/ChangeLog
index 8e9a768cd..ab7f80274 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-17  Robert Millan  <rmh@aybabtu.com>
+
+	* util/i386/pc/grub-setup.c (setup): In find_first_partition_start(),
+	set `first_start' to 0 for non-PC/MSDOS partition maps.
+
 2008-02-16  Robert Millan  <rmh@aybabtu.com>
 
 	* util/i386/pc/grub-setup.c (setup): In find_first_partition_start(),
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index c77cd0991..647d46e41 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -130,10 +130,9 @@ setup (const char *prefix, const char *dir,
 	    first_start = p->start;
 	}
       else
-	{
-	  if (first_start > p->start)
-	    first_start = p->start;
-	}
+	/* In other partition maps, the region after MBR and before first
+	   partition is not reserved (on GPT, it contains the primary header).  */
+	first_start = 0;
 
       return 0;
     }