diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8fc4a85d83..308f730248 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-15  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf2read.c (guess_structure_name): Allocate name on the
+	objfile obstack.
+
 2010-02-15  Tom Tromey  <tromey@redhat.com>
 
 	* c-typeprint.c (c_type_print_base): Reverse order of test.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 43017a4298..a05c946c28 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2765,7 +2765,7 @@ guess_structure_name (struct partial_die_info *struct_pdi,
 		  struct_pdi->name
 		    = obsavestring (actual_class_name,
 				    strlen (actual_class_name),
-				    &cu->comp_unit_obstack);
+				    &cu->objfile->objfile_obstack);
 		  xfree (actual_class_name);
 		}
 	      break;