diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b9b37b0a55..cd954e0e1e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-16  Pedro Alves  <palves@redhat.com>
+
+	PR 16329
+	* sol-thread.c (check_for_thread_db): If the target can't run or
+	isn't a core, return without pushing.
+
 2013-12-15  Joel Brobecker  <brobecker@adacore.com>
 
 	Revert the following commit:
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index b480b58df6..3809aec277 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -578,6 +578,10 @@ check_for_thread_db (void)
   td_err_e err;
   ptid_t ptid;
 
+  /* Don't attempt to use thread_db for remote targets.  */
+  if (!(target_can_run (&current_target) || core_bfd))
+    return;
+
   /* Do nothing if we couldn't load libthread_db.so.1.  */
   if (p_td_ta_new == NULL)
     return;