2 files changed, 7 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 88aa405d3..bc53e052c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:4.6p1-7) UNRELEASED; urgency=low
+
+  * Don't build PIE executables on m68k (closes: #451192).
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 14 Nov 2007 09:30:36 +0000
+
 openssh (1:4.6p1-6) unstable; urgency=low
 
   * Remove blank line between head comment and first template in
diff --git a/debian/rules b/debian/rules
index e69fa652e..13363341e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ ifeq ($(DEB_HOST_ARCH_CPU),)
 endif
 
 ifneq (,$(findstring :$(DEB_HOST_ARCH_OS):,:linux:knetbsd:))
-  ifneq ($(DEB_HOST_ARCH_CPU),hppa)
+  ifeq (,$(findstring :$(DEB_HOST_ARCH_CPU):,:hppa:m68k:))
     # Use position-independent executables to take advantage of address space
     # layout randomisation. TODO: This should be done in configure.
     PIE_CFLAGS := -fPIE