diff --git a/ChangeLog b/ChangeLog
index faab5c500..55151bf8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options): Apply
+	PowerMac workaround to Xserves as well.
+	Information supplied by: Benjamin Herrenschmidt.
+
 2012-06-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Don't assume that beginning address is also the entry point on ppc.
diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
index e04ce5b69..965ad05ce 100644
--- a/grub-core/kern/ieee1275/cmain.c
+++ b/grub-core/kern/ieee1275/cmain.c
@@ -91,7 +91,8 @@ grub_ieee1275_find_options (void)
   if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
     grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
 
-  if (grub_strncmp (tmp, "PowerMac", sizeof ("PowerMac") - 1) == 0)
+  if (grub_strncmp (tmp, "PowerMac", sizeof ("PowerMac") - 1) == 0
+      || grub_strncmp (tmp, "RackMac", sizeof ("RackMac") - 1) == 0)
     grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_BROKEN_ADDRESS_CELLS);
 
   if (is_smartfirmware)