diff --git a/ChangeLog b/ChangeLog
index dfb9f3a4b..5bbb103b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-07-05  Pavel Roskin  <proski@gnu.org>
 
+	* disk/ata.c (grub_ata_dumpinfo): Don't output addressing and
+	size for ATAPI devices, they are undefined.  Output sector
+	number in decimal form.
+
 	* disk/ata.c: Use named constants for status bits.
 
 2008-07-04  Pavel Roskin  <proski@gnu.org>
diff --git a/disk/ata.c b/disk/ata.c
index 015e393a0..7925fb875 100644
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -225,8 +225,11 @@ grub_ata_dumpinfo (struct grub_ata_device *dev, char *info)
   grub_ata_strncpy (text, info + 54, 40);
   grub_printf ("Model: %s\n", text);
 
-  grub_printf ("Addressing: %d\n", dev->addr);
-  grub_printf ("#sectors: 0x%llx\n", dev->size);
+  if (! dev->atapi)
+    {
+      grub_printf ("Addressing: %d\n", dev->addr);
+      grub_printf ("Sectors: %lld\n", dev->size);
+    }
 }
 
 static grub_err_t