diff --git a/ChangeLog b/ChangeLog
index 8814c2279..334f81d71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/loader/i386/pc/plan9.c (fill_disk): Fix types to use
+	intended shifts rather than division.
+
 2013-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/datetime.h (grub_datetime2unixtime): Fix unixtime
diff --git a/grub-core/loader/i386/pc/plan9.c b/grub-core/loader/i386/pc/plan9.c
index 7dc12a808..1c7b381c6 100644
--- a/grub-core/loader/i386/pc/plan9.c
+++ b/grub-core/loader/i386/pc/plan9.c
@@ -292,7 +292,7 @@ fill_disk (const char *name, void *data)
 
       case GRUB_DISK_DEVICE_ATA_ID:
 	{
-	  int unit;
+	  unsigned unit;
 	  if (grub_strlen (dev->disk->name) < sizeof ("ata0") - 1)
 	    unit = 0;
 	  else
@@ -304,7 +304,7 @@ fill_disk (const char *name, void *data)
 	if (((dev->disk->id >> GRUB_SCSI_ID_SUBSYSTEM_SHIFT) & 0xff)
 	    == GRUB_SCSI_SUBSYSTEM_PATA)
 	  {
-	    int unit;
+	    unsigned unit;
 	    if (grub_strlen (dev->disk->name) < sizeof ("ata0") - 1)
 	      unit = 0;
 	    else