diff --git a/ChangeLog b/ChangeLog
index 95c6ad243..557a33a19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/i386/multiboot.c (grub_multiboot_get_bootdev): fix partition 
+	handling
+	
 2009-06-13  Jun Inoue <jun.lambda@gmail.com>
 
 	* util/grub-mkconfig.in: Fix parsing of --output option.
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index efca6511c..8ce315eab 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -170,7 +170,7 @@ grub_multiboot_get_bootdev (grub_uint32_t *bootdev)
 	{
 	  if ((p[0] >= '0') && (p[0] <= '9'))
 	    {
-	      slice = grub_strtoul (p, &p, 0);
+	      slice = grub_strtoul (p, &p, 0) - 1;
 
 	      if ((p) && (p[0] == ','))
 		p++;
@@ -184,7 +184,7 @@ grub_multiboot_get_bootdev (grub_uint32_t *bootdev)
     grub_device_close (dev);
 
   *bootdev = ((biosdev & 0xff) << 24) | ((slice & 0xff) << 16) 
-    | ((part & 0xff) << 16) | 0xff;
+    | ((part & 0xff) << 8) | 0xff;
   return (biosdev != ~0UL);
 #else
   *bootdev = 0xffffffff;