diff --git a/ChangeLog b/ChangeLog
index 3f836f3d3..9ff55aa03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-09  Jochen Hoenicke  <jochen@gnu.org>
+
+	* stage2/disk_io.c (next_partition):  Mask out bsd partition sub
+	type when checking if last partition was a bsd partition.
+	Reported by Heikki Vatiainen <hessu@cs.tut.fi>.
+	
 2000-12-09  OKUJI Yoshinori  <okuji@gnu.org>
 
 	From Leendert Meyer <leen.meyer@home.nl>:
diff --git a/stage2/disk_io.c b/stage2/disk_io.c
index 6d218e7ea..8b3662f6b 100644
--- a/stage2/disk_io.c
+++ b/stage2/disk_io.c
@@ -574,7 +574,7 @@ next_partition (unsigned long drive, unsigned long dest,
 
   /* If previous partition is a BSD partition or a PC slice which
      contains BSD partitions...  */
-  if ((*partition != 0xFFFFFF && IS_PC_SLICE_TYPE_BSD (*type))
+  if ((*partition != 0xFFFFFF && IS_PC_SLICE_TYPE_BSD (*type & 0xff))
       || ! (drive & 0x80))
     {
       if (*type == PC_SLICE_TYPE_NONE)