diff -Nru radare2-0.9.6/debian/changelog radare2-0.9.6/debian/changelog
--- radare2-0.9.6/debian/changelog	2014-03-31 19:27:40.000000000 +0000
+++ radare2-0.9.6/debian/changelog	2014-04-10 16:38:45.000000000 +0000
@@ -1,3 +1,17 @@
+radare2 (0.9.6-3.1ubuntu1) trusty; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Use autotools-dev to update config.{sub,guess} for new arches.
+
+ -- Logan Rosen <logan@ubuntu.com>  Thu, 10 Apr 2014 12:38:27 -0400
+
+radare2 (0.9.6-3.1) unstable; urgency=medium
+
+  * debian/patches/12_fix_strcasestr_declaration: Add #define _GNU_SOURCE
+    as well, to get the definition of strcasestr (closes: #735921).
+
+ -- Steve McIntyre <93sam@debian.org>  Sun, 23 Mar 2014 14:38:44 +0000
+
 radare2 (0.9.6-3ubuntu1) trusty; urgency=low
 
   * Use autotools-dev helper for newer arches.
diff -Nru radare2-0.9.6/debian/patches/12_fix_strcasestr_declaration.patch radare2-0.9.6/debian/patches/12_fix_strcasestr_declaration.patch
--- radare2-0.9.6/debian/patches/12_fix_strcasestr_declaration.patch	2014-03-31 19:24:18.000000000 +0000
+++ radare2-0.9.6/debian/patches/12_fix_strcasestr_declaration.patch	2014-04-10 16:37:16.000000000 +0000
@@ -1,16 +1,18 @@
 Description: Fix an implicit declaration of strcasestr.
  Matthias Klose found a function not defined in the build logs.  It's due
  to a missing include.  I checked upstream and it's has already been fixed.
+ Updated by Steve McIntyre <93sam@debian.org>
 Author: David Martínez Moreno <ender@debian.org>
 Bug-Debian: http://bugs.debian.org/735921
 Forwarded: not-needed
-Last-Update: 2014-01-28
+Last-Update: 2014-03-23
 
-Index: radare2-0.9.6/libr/util/str.c
-===================================================================
---- radare2-0.9.6.orig/libr/util/str.c	2013-11-05 18:26:27.000000000 -0500
-+++ radare2-0.9.6/libr/util/str.c	2014-03-31 15:15:18.000000000 -0400
-@@ -3,6 +3,7 @@
+--- radare2-0.9.6.orig/libr/util/str.c
++++ radare2-0.9.6/libr/util/str.c
+@@ -1,8 +1,10 @@
+ /* radare - LGPL - Copyright 2007-2013 - pancake */
+
++#define _GNU_SOURCE
  #include "r_types.h"
  #include "r_util.h"
  #include <stdio.h>
@@ -18,15 +20,3 @@
  #include <ctype.h>
  #include <stdarg.h>
  
-Index: radare2-0.9.6/libr/util/Makefile
-===================================================================
---- radare2-0.9.6.orig/libr/util/Makefile	2014-03-31 15:15:18.000000000 -0400
-+++ radare2-0.9.6/libr/util/Makefile	2014-03-31 15:24:14.615158918 -0400
-@@ -23,6 +23,7 @@
- endif
- endif
- 
-+CPPFLAGS+=-D_GNU_SOURCE
- LDFLAGS+=${BN_LIBS}
- LDFLAGS+=${TH_LIBS}
-