2 files changed, 8 insertions, 2 deletions

diff --git a/contrib/Makefile b/contrib/Makefile
index 2cef46f6c..00e96e7b9 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -7,9 +7,9 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c
                 `gnome-config --libs gnome gnomeui`
 
 gnome-ssh-askpass2: gnome-ssh-askpass2.c
-        $(CC) `pkg-config --cflags gtk+-2.0` \
+        $(CC) `pkg-config --cflags gtk+-2.0 x11` \
                 gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
-                `pkg-config --libs gtk+-2.0`
+                `pkg-config --libs gtk+-2.0 x11`
 
 clean:
         rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass
diff --git a/debian/changelog b/debian/changelog
index 74b7c6191..7f118e41e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:5.1p1-9) UNRELEASED; urgency=low
+
+  * Use x11.pc when compiling/linking gnome-ssh-askpass2 (closes: #555951).
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 12 Nov 2009 21:31:44 +0000
+
 openssh (1:5.1p1-8) unstable; urgency=low
 
   * Build with just -fPIC on mips/mipsel, not -fPIE as well (thanks, LIU Qi;