2 files changed, 3 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 2c4dc3b01..b5c889046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,7 @@ openssh (1:4.3p2-1) UNRELEASED; urgency=low
   * Update to current GSSAPI patch from
     http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch
     (closes: #352042).
+  * debian/rules: Resynchronise CFLAGS with that generated by configure.
   * Rename KeepAlive to TCPKeepAlive in default sshd_config
     (closes: #349896).
   * debconf template translations:
diff --git a/debian/rules b/debian/rules
index 422fafaf9..3bf18397a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ endif
         # Debian's /var/log/btmp has inappropriate permissions.
         perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h
 
-        $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -std=gnu99 -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""'
+        $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wno-pointer-sign -std=gnu99 -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""'
         # Support building on Debian 3.0 (with GNOME 1.4) and later.
         if [ -f /usr/include/libgnomeui-2.0/gnome.h ]; then \
                 $(MAKE) -C contrib gnome-ssh-askpass2 CC='gcc $(OPTFLAGS) -g -Wall'; \
@@ -92,7 +92,7 @@ build-udeb-stamp:
         # Avoid libnsl linkage. Ugh.
         perl -pi -e 's/ +-lnsl//' build-udeb/config.status
         cd build-udeb && ./config.status
-        $(MAKE) -C build-udeb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-Os -g -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -std=gnu99 -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""' ssh scp sftp sshd ssh-keygen
+        $(MAKE) -C build-udeb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-Os -g -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wno-pointer-sign -std=gnu99 -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""' ssh scp sftp sshd ssh-keygen
         touch build-udeb-stamp
 
 clean: