diff --git a/ChangeLog b/ChangeLog
index fd4c0a37f..5b42899d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-27  Hollis Blanchard  <hollis@penguinppc.org>
+
+	* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Return error if `status'
+	is negative.
+	* kern/ieee1275/ieee1275.c (IEEE1275_IHANDLE_INVALID): Change to 0.
+
 2006-10-26  Hollis Blanchard  <hollis@penguinppc.org>
 
 	* kern/powerpc/ieee1275/openfw.c (grub_ieee1275_encode_devname):
diff --git a/disk/ieee1275/ofdisk.c b/disk/ieee1275/ofdisk.c
index c86a6a802..3ee6cb946 100644
--- a/disk/ieee1275/ofdisk.c
+++ b/disk/ieee1275/ofdisk.c
@@ -136,7 +136,7 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
 
   grub_ieee1275_seek ((grub_ieee1275_ihandle_t) disk->data, (int) (pos >> 32),
 		      (int) pos & 0xFFFFFFFFUL, &status);
-  if (status != 0)
+  if (status < 0)
     return grub_error (GRUB_ERR_READ_ERROR,
 		       "Seek error, can't seek block %llu",
 		       sector);
diff --git a/kern/ieee1275/ieee1275.c b/kern/ieee1275/ieee1275.c
index 03dd1bbaa..913212271 100644
--- a/kern/ieee1275/ieee1275.c
+++ b/kern/ieee1275/ieee1275.c
@@ -21,7 +21,7 @@
 #include <grub/ieee1275/ieee1275.h>
 
 #define IEEE1275_PHANDLE_INVALID  ((grub_ieee1275_phandle_t) -1)
-#define IEEE1275_IHANDLE_INVALID  ((grub_ieee1275_ihandle_t) -1)
+#define IEEE1275_IHANDLE_INVALID  ((grub_ieee1275_ihandle_t) 0)
 #define IEEE1275_CELL_INVALID     ((grub_ieee1275_cell_t) -1)