diff --git a/ChangeLog b/ChangeLog
index b2474813f..56a19cdf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-16  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	From H.J. Lu <hjl@gnu.org>:
+	* stage2/disk_io.c (part_start): Use unsigned long to support
+	large disks.
+	(part_length): Likewise.
+	* stage2/shared.h (part_start): Likewise.
+	(part_length): Likewise.
+
 2003-01-05  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* configure.in (CFLAGS): When the default CFLAGS is used,
diff --git a/stage2/disk_io.c b/stage2/disk_io.c
index b48c9878c..0e54a0209 100644
--- a/stage2/disk_io.c
+++ b/stage2/disk_io.c
@@ -107,8 +107,8 @@ static int block_file = 0;
 #endif /* NO_BLOCK_FILES */
 
 /* these are the translated numbers for the open partition */
-long part_start;
-long part_length;
+unsigned long part_start;
+unsigned long part_length;
 
 int current_slice;
 
diff --git a/stage2/shared.h b/stage2/shared.h
index db9ff44f8..14c134adc 100644
--- a/stage2/shared.h
+++ b/stage2/shared.h
@@ -637,8 +637,8 @@ struct geometry
   unsigned long flags;
 };
 
-extern long part_start;
-extern long part_length;
+extern unsigned long part_start;
+extern unsigned long part_length;
 
 extern int current_slice;