diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3f4b94f1f6e..4b8e9ce1601 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-25  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* linux-thread-db.c (thread_from_lwp): Initialize th.th_unique.
+
 2011-07-25  Pedro Alves  <pedro@codesourcery.com>
 
 	* breakpoint.h (print_recreate_thread): Declare.
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index f43efc74c48..6427f8b9437 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -431,6 +431,9 @@ thread_from_lwp (ptid_t ptid)
   struct thread_db_info *info;
   struct thread_get_info_inout io = {0};
 
+  /* Just in case td_ta_map_lwp2thr doesn't initialize it completely.  */
+  th.th_unique = 0;
+
   /* This ptid comes from linux-nat.c, which should always fill in the
      LWP.  */
   gdb_assert (GET_LWP (ptid) != 0);