diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile
index f46a154c4..ec91e9b92 100644
--- a/debian/build/tools/perf/Makefile
+++ b/debian/build/tools/perf/Makefile
@@ -17,7 +17,7 @@ else ifeq ($(DEB_HOST_ARCH_CPU),powerpc64)
 else ifeq ($(DEB_HOST_ARCH_CPU),s390)
   KERNEL_ARCH_PERF = s390
 else ifeq ($(DEB_HOST_ARCH_CPU),s390x)
-  KERNEL_ARCH_PERF = s390x
+  KERNEL_ARCH_PERF = s390
 else ifeq ($(DEB_HOST_ARCH_CPU),sh4)
   KERNEL_ARCH_PERF = sh
 else ifeq ($(DEB_HOST_ARCH_CPU),sparc)
diff --git a/debian/changelog b/debian/changelog
index 51ddd856f..eb640b2b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-tools (3.1.1-3) UNRELEASED; urgency=low
+
+  * Fix s390x support.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 18 Nov 2011 17:26:51 +0100
+
 linux-tools (3.1.1-2) unstable; urgency=low
 
   * Change the check for stale debian/control to tolerate binNMUs
diff --git a/debian/rules.real b/debian/rules.real
index 45eb8f390..17eec6acb 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -5,7 +5,7 @@ include debian/rules.defs
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 binary-arch: install-kbuild
-ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
+ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
   binary-arch: install-tools
 endif