diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 99660776da8..b5429373614 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 10 14:32:40 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Don't crash if
+	a version dependency could not be found.
+
 Tue Nov  4 12:05:56 1997  Klaus K"ampf  <kkaempf@progis.de>
 
 	* configure.com: Get version info from configure.in
diff --git a/bfd/elflink.h b/bfd/elflink.h
index 97bb4b935a4..711372d88cd 100644
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -2542,7 +2542,14 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 
 	      for (n = t->deps; n != NULL; n = n->next)
 		{
-		  defaux.vda_name = n->version_needed->name_indx;
+		  if (n->version_needed == NULL)
+		    {
+		      /* This can happen if there was an error in the
+			 version script.  */
+		      defaux.vda_name = 0;
+		    }
+		  else
+		    defaux.vda_name = n->version_needed->name_indx;
 		  if (n->next == NULL)
 		    defaux.vda_next = 0;
 		  else