diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d11535d921b..270d2f0dae7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-03  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* dbxread.c (read_ofile_symtab): Move current_objfile
+	clearing to after end_stabs.
+
 2007-04-01  Andreas Schwab  <schwab@suse.de>
 
 	* rs6000-tdep.c (rs6000_convert_from_func_ptr_addr): Use parameter
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 33d164e8c6c..b26d00c6f22 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -2608,8 +2608,6 @@ read_ofile_symtab (struct partial_symtab *pst)
 	}
     }
 
-  current_objfile = NULL;
-
   /* In a Solaris elf file, this variable, which comes from the
      value of the N_SO symbol, will still be 0.  Luckily, text_offset,
      which comes from pst->textlow is correct. */
@@ -2625,6 +2623,8 @@ read_ofile_symtab (struct partial_symtab *pst)
   pst->symtab = end_symtab (text_offset + text_size, objfile, SECT_OFF_TEXT (objfile));
 
   end_stabs ();
+
+  current_objfile = NULL;
 }