diff --git a/ChangeLog b/ChangeLog
index 6c6f75ba8..c92c49562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-01  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* grub-core/partmap/bsdlabel.c (iterate_real): Fix an integer overflow.
+
 2010-11-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/loader/i386/linux.c (grub_cmd_linux): Autoload vbe.mod if
diff --git a/grub-core/partmap/bsdlabel.c b/grub-core/partmap/bsdlabel.c
index eff3bbe44..09ecd935a 100644
--- a/grub-core/partmap/bsdlabel.c
+++ b/grub-core/partmap/bsdlabel.c
@@ -44,7 +44,7 @@ iterate_real (grub_disk_t disk, grub_disk_addr_t sector, int freebsd,
   struct grub_partition_bsd_disk_label label;
   struct grub_partition p;
   grub_disk_addr_t delta = 0;
-  unsigned pos;
+  grub_disk_addr_t pos;
 
   /* Read the BSD label.  */
   if (grub_disk_read (disk, sector, 0, sizeof (label), &label))