diff -u strace-4.5.15/debian/control strace-4.5.15/debian/control
--- strace-4.5.15/debian/control
+++ strace-4.5.15/debian/control
@@ -3,7 +3,7 @@
 Priority: standard
 Maintainer: Roland McGrath <frob@debian.org>
 Uploaders: Wichert Akkerman <wakkerma@debian.org>, Frederik Schüler <fs@debian.org>
-Build-Depends: libc6-dev (>= 2.2.2-1) [!alpha !ia64], libc6.1-dev (>= 2.2.2-1) [alpha ia64], libc6-dev-s390x [s390], libc6-dev-sparc64 [sparc], debhelper (>= 5.0.0)
+Build-Depends: libc6-dev (>= 2.2.2-1) [!alpha !ia64], libc6.1-dev (>= 2.2.2-1) [alpha ia64], gcc-multilib [i386 powerpc s390 sparc], debhelper (>= 5.0.0)
 Standards-Version: 3.7.2
 
 Package: strace
diff -u strace-4.5.15/debian/rules strace-4.5.15/debian/rules
--- strace-4.5.15/debian/rules
+++ strace-4.5.15/debian/rules
@@ -10,20 +10,12 @@
 VERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
 UDEB := strace-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb
 
-ifeq ($(DEB_HOST_GNU_TYPE),sparc-linux)
-  build64 = yes
-  HOST64 = sparc64-linux
+arch64_map = i386=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x
+ifneq (,$(filter $(DEB_HOST_ARCH)=%, $(arch64_map)))
+  HOST64 = $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
+	     $(filter $(DEB_HOST_ARCH)=%, $(arch64_map))))-linux-gnu
   CC64 = gcc -m64
-endif
-
-ifeq ($(DEB_HOST_GNU_TYPE),s390-linux)
-  build64 = yes
-  HOST64 = s390x-linux
-  CC64 = gcc -m64
-endif
-
-ifeq ($(build64),yes)
-   extra_build_targets += stamp-build64
+  extra_build_targets += stamp-build64
 endif
 
 ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
@@ -32,7 +24,7 @@
   CONFIG_OPTS = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-all build: stamp-build
+all build: stamp-build $(extra_build_targets)
 
 stamp-%: %/Makefile
 	$(MAKE) -C $*
@@ -55,7 +47,7 @@
 
 binary-indep:
 
-binary-arch: $(extra_build_targets) build checkroot
+binary-arch: build checkroot
 	test -f stamp-build || make $(MFLAGS) -f debian/rules build
 	-rm -rf debian/tmp debian/files debian/substvars
 
@@ -88,7 +80,7 @@
 	install -p -o root -g root -m 644 strace.1 debian/tmp/usr/share/man/man1/strace.1
 	gzip -9 debian/tmp/usr/share/man/man1/strace.1
 
-ifeq ($(build64),yes)
+ifneq (,$(HOST64))
 	install -s -o root -g root -m 755 build64/strace debian/tmp/usr/bin/strace64
 	ln -s strace.1.gz debian/tmp/usr/share/man/man1/strace64.1.gz
 	#dh_strip
diff -u strace-4.5.15/debian/changelog strace-4.5.15/debian/changelog
--- strace-4.5.15/debian/changelog
+++ strace-4.5.15/debian/changelog
@@ -1,3 +1,9 @@
+strace (4.5.15-1.1) unstable; urgency=low
+
+  * Build 64bit binary on i386, powerpc, sparc, s390. 
+
+ -- Matthias Klose <doko@debian.org>  Thu, 02 Aug 2007 08:31:03 +0200
+
 strace (4.5.15-1) unstable; urgency=high
 
   [ Roland McGrath ]