diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3f50bca427..a1fed961d0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-28  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* config/nm-linux.h: Do not include <signal.h>.
+	(REALTIME_LO, REALTIME_HI): Do not define.
+	* signals/signals.c (REALTIME_HI): Fix off-by-one bug.
+
 2006-11-28  Vladimir Prus  <vladimir@codesourcery.com>
 
 	* mi/mi-cmd-var.c (mi_cmd_var_create): Fix cleanup
diff --git a/gdb/config/nm-linux.h b/gdb/config/nm-linux.h
index b866ea4552..b79875eb68 100644
--- a/gdb/config/nm-linux.h
+++ b/gdb/config/nm-linux.h
@@ -25,16 +25,6 @@ struct target_ops;
 /* GNU/Linux is SVR4-ish but its /proc file system isn't.  */
 #undef USE_PROC_FS
 
-/* Since we're building a native debugger, we can include <signal.h>
-   to find the range of real-time signals.  */
-
-#include <signal.h>
-
-#ifdef __SIGRTMIN
-#define REALTIME_LO	__SIGRTMIN
-#define REALTIME_HI	(__SIGRTMAX + 1)
-#endif
-
 extern void lin_lwp_attach_lwp (ptid_t ptid, int verbose);
 #define ATTACH_LWP(ptid, verbose) lin_lwp_attach_lwp ((ptid), (verbose))
 
diff --git a/gdb/signals/signals.c b/gdb/signals/signals.c
index cc7ab806fe..63eb333c48 100644
--- a/gdb/signals/signals.c
+++ b/gdb/signals/signals.c
@@ -37,10 +37,10 @@
 #ifndef REALTIME_LO
 # if defined(__SIGRTMIN)
 #  define REALTIME_LO __SIGRTMIN
-#  define REALTIME_HI __SIGRTMAX
+#  define REALTIME_HI (__SIGRTMAX + 1)
 # elif defined(SIGRTMIN)
 #  define REALTIME_LO SIGRTMIN
-#  define REALTIME_HI SIGRTMAX
+#  define REALTIME_HI (SIGRTMAX + 1)
 # endif
 #endif