diff --git a/ChangeLog b/ChangeLog
index 2cba36f0c..139fe637a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-02  Gordon Matzigkeit  <gord@fig.org>
+
+	* stage2/common.c (init_bios_info): Ignore zero-length memory
+	ranges.  From Derrik Pates.
+
 2001-07-26  Jochen Hoenicke  <jochen@gnu.org>
 
 	* stage2/Makefile.am (libgrub_a_CFLAGS): Enable USE_MD5_PASSWORDS
diff --git a/stage2/common.c b/stage2/common.c
index 8db221e94..7ecd5928d 100644
--- a/stage2/common.c
+++ b/stage2/common.c
@@ -226,7 +226,7 @@ init_bios_info (void)
 	{
 	  struct AddrRangeDesc *desc = (struct AddrRangeDesc *) addr;
 	  
-	  if (desc->Type == MB_ARD_MEMORY
+	  if (desc->Type == MB_ARD_MEMORY && desc->Length > 0
 	      && desc->BaseAddr + desc->Length > max_addr)
 	    max_addr = desc->BaseAddr + desc->Length;
 	}