diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0ca280b18e..61b91bf50f 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,12 @@
+Tue Mar 26 18:14:49 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ldmain.c (main): Call bfd_set_error_program_name.
+
 Thu Mar 21 13:17:34 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+	* ld.texinfo: Fix a couple of indexing entries.  Mention that
+	--verbose displays builtin linker scripts.
+
 	* ldmisc.c (vfinfo): case 'I': If the file is not in an archive,
 	and the local symbol name does not match the filename, print the
 	filename as well.
diff --git a/ld/ldmain.c b/ld/ldmain.c
index 6d78e27def..1096368a9d 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -162,6 +162,8 @@ main (argc, argv)
 
   bfd_init ();
 
+  bfd_set_error_program_name (program_name);
+
   xatexit (remove_output);
 
   /* Initialize the data about options.  */
@@ -515,6 +517,25 @@ add_ysym (name)
     einfo ("%P%F: bfd_hash_lookup failed: %E\n");
 }
 
+/* Record a symbol to be wrapped, from the --wrap option.  */
+
+void
+add_wrap (name)
+     const char *name;
+{
+  if (link_info.wrap_hash == NULL)
+    {
+      link_info.wrap_hash = ((struct bfd_hash_table *)
+			     xmalloc (sizeof (struct bfd_hash_table)));
+      if (! bfd_hash_table_init_n (link_info.wrap_hash,
+				   bfd_hash_newfunc,
+				   61))
+	einfo ("%P%F: bfd_hash_table_init failed: %E\n");
+    }
+  if (bfd_hash_lookup (link_info.wrap_hash, name, true, true) == NULL)
+    einfo ("%P%F: bfd_hash_lookup failed: %E\n");
+}
+
 /* Handle the -retain-symbols-file option.  */
 
 void