diff --git a/debian/changelog b/debian/changelog
index 6945c8f..4baa7f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,11 @@ xbase-clients (1:7.2.ds1-1) UNRELEASED; urgency=low
   * Update to xsetpointer 1.0.1.
     + Add build-dep on x11proto-input-dev >= 1.4.
   * Update to xtrap 1.0.2.
+  * Modify patch 08_xlsfonts_do_not_spew_usage_on_connection_error.diff to
+    apply to xprop, xwd and xwininfo as well, since they all use a copy of
+    dsimple.c.
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 11 Feb 2007 08:06:27 +0100
+ -- Julien Cristau <jcristau@debian.org>  Sun, 11 Feb 2007 08:17:47 +0100
 
 xbase-clients (1:7.1.ds1-2) unstable; urgency=low
 
diff --git a/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff b/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff
index 9e77d51..622fcdd 100644
--- a/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff
+++ b/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff
@@ -8,15 +8,12 @@ The user should only be shown a usage messages when:
   * it is asked for with a --help option or the like.
   * the command line is syntactically invalid.
 
-Because xlsfonts's dsimple.c source file is also used in xprop, xwd, and
-xwininfo, this patch also corrects this behavior for those programs.
-
 Not submitted upstream to XFree86 or X.Org.
 
 Index: xlsfonts/dsimple.c
 ===================================================================
---- xlsfonts/dsimple.c.orig	2006-02-18 14:55:15.000000000 -0500
-+++ xlsfonts/dsimple.c	2006-02-26 22:36:04.000000000 -0500
+--- xlsfonts/dsimple.c.orig	2006-07-11 04:53:33.000000000 +0200
++++ xlsfonts/dsimple.c	2007-02-11 08:14:45.000000000 +0100
 @@ -188,8 +188,7 @@
  	if (d == NULL) {
  	    fprintf (stderr, "%s:  unable to open display '%s'\n",
@@ -26,4 +23,46 @@ Index: xlsfonts/dsimple.c
 +	    exit (1);
  	}
  
+ 	return(d);
+Index: xprop/dsimple.c
+===================================================================
+--- xprop/dsimple.c.orig	2007-02-11 08:15:17.000000000 +0100
++++ xprop/dsimple.c	2007-02-11 08:15:40.000000000 +0100
+@@ -188,8 +188,7 @@
+ 	if (d == NULL) {
+ 	    fprintf (stderr, "%s:  unable to open display '%s'\n",
+ 		     program_name, XDisplayName (display_name));
+-	    usage ();
+-	    /* doesn't return */
++	    exit(1);
+ 	}
+ 
+ 	return(d);
+Index: xwd/dsimple.c
+===================================================================
+--- xwd/dsimple.c.orig	2007-02-11 08:15:57.000000000 +0100
++++ xwd/dsimple.c	2007-02-11 08:16:10.000000000 +0100
+@@ -188,8 +188,7 @@
+ 	if (d == NULL) {
+ 	    fprintf (stderr, "%s:  unable to open display '%s'\n",
+ 		     program_name, XDisplayName (display_name));
+-	    usage ();
+-	    /* doesn't return */
++	    exit(1);
+ 	}
+ 
+ 	return(d);
+Index: xwininfo/dsimple.c
+===================================================================
+--- xwininfo/dsimple.c.orig	2007-02-11 08:16:29.000000000 +0100
++++ xwininfo/dsimple.c	2007-02-11 08:16:47.000000000 +0100
+@@ -188,8 +188,7 @@
+ 	if (d == NULL) {
+ 	    fprintf (stderr, "%s:  unable to open display '%s'\n",
+ 		     program_name, XDisplayName (display_name));
+-	    usage ();
+-	    /* doesn't return */
++	    exit(1);
+ 	}
+ 
  	return(d);