diff --git a/ChangeLog b/ChangeLog
index f0f26e1f2..53594779b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-04  Felix Zielcke  <fzielcke@z-51.de>
+
+	* partmap/pc.c (pc_partition_map_iterate): Skip over invalid BSD partitions
+	or if there's no space for the disk label and print the partition number on a
+	invalid magic.
+
 2009-03-04  Felix Zielcke  <fzielcke@z-51.de>
 
 	* util/misc.c: Include <time.h>.
diff --git a/partmap/pc.c b/partmap/pc.c
index d7e1da162..38aa75278 100644
--- a/partmap/pc.c
+++ b/partmap/pc.c
@@ -1,7 +1,7 @@
 /* pc.c - Read PC style partition tables.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2004,2005,2006,2007,2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2002,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by