diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3b4e031439..7b58f006ab 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-11  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf2read.c (dwarf2_get_dwz_file): Set 'dwz_file'.
+
 2012-12-11  Tom Tromey  <tromey@redhat.com>
 
 	* dsrec.c (report_transfer_performance): Don't declare.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index b0f90ffa48..e469959db1 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2112,6 +2112,7 @@ dwarf2_get_dwz_file (void)
 
   do_cleanups (cleanup);
 
+  dwarf2_per_objfile->dwz_file = result;
   return result;
 }