diff --git a/src/cmd/ld/dwarf.c b/src/cmd/ld/dwarf.c
index ba735265c8..98b068008b 100644
--- a/src/cmd/ld/dwarf.c
+++ b/src/cmd/ld/dwarf.c
@@ -2567,12 +2567,8 @@ dwarfaddpeheaders(void)
 	newPEDWARFSection(".debug_line", linesize);
 	newPEDWARFSection(".debug_frame", framesize);
 	newPEDWARFSection(".debug_info", infosize);
-	if (pubnamessize > 0)
-		newPEDWARFSection(".debug_pubnames", pubnamessize);
-	if (pubtypessize > 0)
-		newPEDWARFSection(".debug_pubtypes", pubtypessize);
-	if (arangessize > 0)
-		newPEDWARFSection(".debug_aranges", arangessize);
-	if (gdbscriptsize > 0)
-		newPEDWARFSection(".debug_gdb_scripts", gdbscriptsize);
+	newPEDWARFSection(".debug_pubnames", pubnamessize);
+	newPEDWARFSection(".debug_pubtypes", pubtypessize);
+	newPEDWARFSection(".debug_aranges", arangessize);
+	newPEDWARFSection(".debug_gdb_scripts", gdbscriptsize);
 }
diff --git a/src/cmd/ld/pe.c b/src/cmd/ld/pe.c
index 0d4240e36d..d523ca9c5b 100644
--- a/src/cmd/ld/pe.c
+++ b/src/cmd/ld/pe.c
@@ -415,6 +415,9 @@ newPEDWARFSection(char *name, vlong size)
 	IMAGE_SECTION_HEADER *h;
 	char s[8];
 
+	if(size == 0)
+		return nil;
+
 	if(nextsymoff+strlen(name)+1 > sizeof(symnames)) {
 		diag("pe string table is full");
 		errorexit();