diff -Nru gdb-7.4.1/debian/changelog gdb-7.4.1/debian/changelog
--- gdb-7.4.1/debian/changelog	2012-04-26 18:29:47.000000000 +0200
+++ gdb-7.4.1/debian/changelog	2012-05-12 12:25:16.000000000 +0200
@@ -1,3 +1,11 @@
+gdb (7.4.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix LinuxThreads signal handling on GNU/kFreeBSD.  (Closes: #550361,
+    #669043)
+
+ -- Robert Millan <rmh@debian.org>  Sat, 12 May 2012 12:25:16 +0200
+
 gdb (7.4.1-1) unstable; urgency=low
 
   * New upstream release:
diff -Nru gdb-7.4.1/debian/patches/linuxthreads_signal_handling.patch gdb-7.4.1/debian/patches/linuxthreads_signal_handling.patch
--- gdb-7.4.1/debian/patches/linuxthreads_signal_handling.patch	1970-01-01 01:00:00.000000000 +0100
+++ gdb-7.4.1/debian/patches/linuxthreads_signal_handling.patch	2012-05-12 12:26:51.000000000 +0200
@@ -0,0 +1,36 @@
+
+Temporary support for LinuxThreads signal handling on GNU/kFreeBSD (see #669043)
+
+--- a/gdb/common/signals.c
++++ b/gdb/common/signals.c
+@@ -334,6 +334,15 @@
+     return TARGET_SIGNAL_INFO;
+ #endif
+ 
++#if defined(__GLIBC__) && defined(__FreeBSD_kernel__)
++  if (hostsig == 32)
++    return TARGET_SIGNAL_LINUXTHREADS_RESTART;
++  if (hostsig == 33)
++    return TARGET_SIGNAL_LINUXTHREADS_CANCEL;
++  if (hostsig == 34)
++    return TARGET_SIGNAL_LINUXTHREADS_DEBUG;
++#endif
++
+ #if defined (REALTIME_LO)
+   if (hostsig >= REALTIME_LO && hostsig < REALTIME_HI)
+     {
+--- a/include/gdb/signals.def
++++ b/include/gdb/signals.def
+@@ -194,7 +194,11 @@
+ SET (TARGET_EXC_SOFTWARE, 149, "EXC_SOFTWARE", "Software generated exception")
+ SET (TARGET_EXC_BREAKPOINT, 150, "EXC_BREAKPOINT", "Breakpoint")
+ 
++SET (TARGET_SIGNAL_LINUXTHREADS_RESTART, 151, "32", "LinuxThreads restart signal")
++SET (TARGET_SIGNAL_LINUXTHREADS_CANCEL, 152, "33", "LinuxThreads cancel signal")
++SET (TARGET_SIGNAL_LINUXTHREADS_DEBUG, 153, "34", "LinuxThreads debug signal")
++
+ /* If you are adding a new signal, add it just above this comment.  */
+ 
+ /* Last and unused enum value, for sizing arrays, etc.  */
+-SET (TARGET_SIGNAL_LAST, 151, NULL, "TARGET_SIGNAL_MAGIC")
++SET (TARGET_SIGNAL_LAST, 154, NULL, "TARGET_SIGNAL_MAGIC")
diff -Nru gdb-7.4.1/debian/patches/series gdb-7.4.1/debian/patches/series
--- gdb-7.4.1/debian/patches/series	2012-01-28 00:37:30.000000000 +0100
+++ gdb-7.4.1/debian/patches/series	2012-05-12 12:25:43.000000000 +0200
@@ -10,3 +10,4 @@
 #0001-netbsd-init-match-property-field.patch
 #0002-add-cpu-to-source-release.patch
 #renesas-sh-native-support.patch
+linuxthreads_signal_handling.patch