2 files changed, 13 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 21c0636b2..e8c9e4ba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:4.6p1-3) UNRELEASED; urgency=low
+
+  * Only build PIE executables on Linux and NetBSD (closes: #430455).
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 26 Jun 2007 09:56:40 +0100
+
 openssh (1:4.6p1-2) unstable; urgency=low
 
   * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL.
diff --git a/debian/rules b/debian/rules
index 71e291b7a..8edbc884b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,11 +12,6 @@ else
 OPTFLAGS := -O0
 endif
 
-# Use position-independent executables to take advantage of address space
-# layout randomisation. TODO: This should be done in configure.
-PIE_CFLAGS := -fPIE
-PIE_LDFLAGS := -fPIE -pie
-
 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
 
 # Take account of old dpkg-architecture output.
@@ -27,6 +22,13 @@ ifeq ($(DEB_HOST_ARCH_OS),)
   endif
 endif
 
+ifneq (,$(findstring :$(DEB_HOST_ARCH_OS):,:linux:knetbsd:)
+# Use position-independent executables to take advantage of address space
+# layout randomisation. TODO: This should be done in configure.
+PIE_CFLAGS := -fPIE
+PIE_LDFLAGS := -fPIE -pie
+endif
+
 ifeq (,$(wildcard /usr/bin/po2debconf))
 PO2DEBCONF := no
 MINDEBCONFVER := 0.5