diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 56ed6c0803..105fbd9336 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-20  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* linux-nat.c (lin_thread_get_thread_signals): Default to __SIGRTMIN
+	and __SIGRTMIN + 1.
+
 2006-02-20  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* remote.c: Add an enumeration for configurable remote
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index b08943298b..0710ac718a 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -3413,12 +3413,18 @@ lin_thread_get_thread_signals (sigset_t *set)
   sigemptyset (set);
 
   restart = get_signo ("__pthread_sig_restart");
-  if (restart == 0)
-    return;
-
   cancel = get_signo ("__pthread_sig_cancel");
+
+  /* LinuxThreads normally uses the first two RT signals, but in some legacy
+     cases may use SIGUSR1/SIGUSR2.  NPTL always uses RT signals, but does
+     not provide any way for the debugger to query the signal numbers -
+     fortunately they don't change!  */
+
+  if (restart == 0)
+    restart = __SIGRTMIN;
+
   if (cancel == 0)
-    return;
+    cancel = __SIGRTMIN + 1;
 
   sigaddset (set, restart);
   sigaddset (set, cancel);