diff --git a/debian/changelog b/debian/changelog
index 35b576f..047fcb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,22 @@
-xbase-clients (1:7.1.ds-3) unstable; urgency=low
+xbase-clients (1:7.1.ds-3) UNRELEASED; urgency=low
 
+  [ Branden Robinson ]
   * Patch xprop to stop segfaulting when deleted atoms are requested.
     Committed upstream as git 47514347db811d002e7f3ca05d390565bc3ee5e5.
     (Closes: #197526)
 
- -- Branden Robinson <branden@debian.org>  Wed, 26 Jul 2006 23:32:23 -0400
+  [ Denis Barbier ]
+  * Acknowledge NMU, thanks dann frazier. (closes: #363198)
+
+ -- Denis Barbier <barbier@debian.org>  Mon,  7 Aug 2006 21:30:25 +0200
+
+xbase-clients (1:7.1.ds-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix implicit pointer conversion in xconsole.c (closes: #363198)
+    (Was fixed in 1:7.1.ds-1.1 NMU, but silently dropped in 1:7.1.ds-2 MU)
+
+ -- dann frazier <dannf@debian.org>  Sat, 29 Jul 2006 13:59:40 -0600
 
 xbase-clients (1:7.1.ds-2) unstable; urgency=high
 
diff --git a/debian/patches/13_xconsole_implicit_pointer_conversion.diff b/debian/patches/13_xconsole_implicit_pointer_conversion.diff
new file mode 100644
index 0000000..00dc3c4
--- /dev/null
+++ b/debian/patches/13_xconsole_implicit_pointer_conversion.diff
@@ -0,0 +1,10 @@
+--- xbase-clients-7.1.ds.orig/xconsole/xconsole.c	2006-05-23 20:11:37.000000000 -0600
++++ xbase-clients-7.1.ds/xconsole/xconsole.c	2006-06-17 14:11:47.000000000 -0600
+@@ -28,6 +28,7 @@
+ 
+ /* $XFree86: xc/programs/xconsole/xconsole.c,v 3.31tsi Exp $ */
+ 
++#define _XOPEN_SOURCE
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Xatom.h>
diff --git a/debian/patches/series b/debian/patches/series
index 3589cb4..ec27662 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,5 +9,6 @@
 10_debian_add_xkbpath_env_variable.diff -p0
 11_xkb_documentation_updates.diff -p0
 12_startx_paths.diff
+13_xconsole_implicit_pointer_conversion.diff
 pkgconfig_naughtiness -p0
 14_SECURITY_setuid.diff