diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 731716f0be71..d611a1fb4e78 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-21  Ian Lance Taylor  <iant@google.com>
+
+	PR go/82284
+	* elf.c (backtrace_initialize): Set pd.exe_filename.
+
 2017-09-20  Ian Lance Taylor  <iant@golang.org>
 	    Denis Khalikov  <d.khalikov@partner.samsung.com>
 
diff --git a/libbacktrace/elf.c b/libbacktrace/elf.c
index 530d4a2e2f4b..eb7d303712aa 100644
--- a/libbacktrace/elf.c
+++ b/libbacktrace/elf.c
@@ -1489,6 +1489,7 @@ backtrace_initialize (struct backtrace_state *state, const char *filename,
   pd.fileline_fn = &elf_fileline_fn;
   pd.found_sym = &found_sym;
   pd.found_dwarf = &found_dwarf;
+  pd.exe_filename = filename;
   pd.exe_descriptor = ret < 0 ? descriptor : -1;
 
   dl_iterate_phdr (phdr_callback, (void *) &pd);