diff --git a/second/partition.c b/second/partition.c
index 9a7fe73..d20a0ed 100644
--- a/second/partition.c
+++ b/second/partition.c
@@ -287,7 +287,7 @@ partition_amiga_lookup( const char *dev_name, prom_handle disk,
 	for (i=0; i < possible; i++) used[i] = 0;
 
 
-	for (part = amiga_block[AMIGA_PARTITIONS], partition = 0;
+	for (part = amiga_block[AMIGA_PARTITIONS], partition = 1;
 		part != AMIGA_END;
 		part = amiga_block[AMIGA_PART_NEXT], partition++)
 	{
diff --git a/second/yaboot.c b/second/yaboot.c
index 5fc1213..2d2b7bc 100644
--- a/second/yaboot.c
+++ b/second/yaboot.c
@@ -1749,7 +1749,7 @@ yaboot_main(void)
 	  prom_printf("%s: Unable to parse\n", bootdevice);
 	  return -1;
      }
-     if (_machine == _MACH_bplan)
+     if (_machine == _MACH_bplan && !conf_given)
         boot.part++;
      DEBUG_F("After parse_device_path: dev=%s, part=%d, file=%s\n",
 	     boot.dev, boot.part, boot.file);