diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c2c8e1e2821..ed99d928804 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-19  John Baldwin  <jhb@FreeBSD.org>
+
+	* elf.c (elfcore_grok_note): Recognize NT_FREEBSD_THRMISC notes.
+
 2016-01-18  Miranda Cupertino  <Cupertino.Miranda@synopsys.com>
 	    Zissulescu Claudiu  <Claudiu.Zissulescu@synopsys.com>
 
diff --git a/bfd/elf.c b/bfd/elf.c
index a1f857a900b..b2a50bff3e7 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -9287,6 +9287,13 @@ elfcore_grok_note (bfd *abfd, Elf_Internal_Note *note)
     case NT_SIGINFO:
       return elfcore_make_note_pseudosection (abfd, ".note.linuxcore.siginfo",
 					      note);
+
+    case NT_FREEBSD_THRMISC:
+      if (note->namesz == 8
+	  && strcmp (note->namedata, "FreeBSD") == 0)
+	return elfcore_make_note_pseudosection (abfd, ".thrmisc", note);
+      else
+	return TRUE;
     }
 }