diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 40c0fe4b4c..fe4e12049a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -6,6 +6,8 @@ Wed May  1 18:39:32 1996  Doug Evans  <dje@canuck.cygnus.com>
 Wed May  1 14:17:57 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* coffcode.h (STRING_SIZE_SIZE): Define.
+	(styp_to_sec_flags): Handle long symbol names when looking for the
+	section symbol.
 	(bfd_coff_backend_data): Add _bfd_coff_long_section_names field.
 	(bfd_coff_long_section_names): Define.
 	(coff_write_object_contents): Handle long section names.
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 2c716f66ff..82447d3660 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -585,15 +585,16 @@ styp_to_sec_flags (abfd, hdr, name)
 
 	      if (isym.n_sclass == C_STAT
 		  && isym.n_type == T_NULL
-		  && isym.n_numaux == 1
-		  && isym._n._n_n._n_zeroes != 0)
+		  && isym.n_numaux == 1)
 		{
 		  char buf[SYMNMLEN + 1];
+		  const char *symname;
 
-		  memcpy (buf, isym._n._n_name, SYMNMLEN);
-		  buf[SYMNMLEN] = '\0';
+		  symname = _bfd_coff_internal_syment_name (abfd, &isym, buf);
+		  if (symname == NULL)
+		    abort ();
 
-		  if (strcmp (name, buf) == 0)
+		  if (strcmp (name, symname) == 0)
 		    {
 		      union internal_auxent aux;
 
@@ -2373,7 +2374,7 @@ coff_write_object_contents (abfd)
 	if (len > SCNNMLEN)
 	  {
 	    memset (section.s_name, 0, SCNNMLEN);
-	    sprintf (section.s_name, "/%d", string_size);
+	    sprintf (section.s_name, "/%lu", (unsigned long) string_size);
 	    string_size += len + 1;
 	  }
       }