diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 20631b52d3..0333167456 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-02  Joel Brobecker  <brobecker@adacore.com>
+
+	* rs6000-nat.c (add_vmap): Set "last" to "next" after having
+	unref'ed it.
+
 2012-10-01  Andrew Burgess  <aburgess@broadcom.com>
 
 	* target.c (simple_search_memory): Include access length in
diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c
index 3eb2cd7099..2d2df5bce2 100644
--- a/gdb/rs6000-nat.c
+++ b/gdb/rs6000-nat.c
@@ -771,6 +771,7 @@ add_vmap (LdInfo *ldi)
 
 	  next = gdb_bfd_openr_next_archived_file (abfd, last);
 	  gdb_bfd_unref (last);
+	  last = next;
 	}
 
       if (!last)