diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 757cc690f22..6387550c5b6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-03  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elfread.c (elf_symtab_read): Also mark solib trampoline minimal
+	symbols special.
+
 2014-10-03  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* breakpoint.h (bp_target_info): Add `reqstd_address' member,
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 9b8233cc829..19aaed35dc8 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -328,7 +328,10 @@ elf_symtab_read (struct objfile *objfile, int type,
 	    (sym->name, strlen (sym->name), copy_names,
 	     symaddr, mst_solib_trampoline, sect, objfile);
 	  if (msym != NULL)
-	    msym->filename = filesymname;
+	    {
+	      msym->filename = filesymname;
+	      gdbarch_elf_make_msymbol_special (gdbarch, sym, msym);
+	    }
 	  continue;
 	}