diff --git a/gnu/dist/binutils/bfd/elf.c b/gnu/dist/binutils/bfd/elf.c
index 523dfc097980..7989731a550d 100644
--- a/gnu/dist/binutils/bfd/elf.c
+++ b/gnu/dist/binutils/bfd/elf.c
@@ -4105,7 +4105,11 @@ get_program_header_size (abfd)
 	  && strncmp (s->name, ".note", 5) == 0)
 	{
 	  /* We need a PT_NOTE segment.  */
-	  ++segs;
+	  /*
+	   * XXX: we allocate 2 here, because we can get 2 elf_segment_map's
+	   * from it.
+	   */
+	  segs += 2;
 	}
     }