diff --git a/lm_sensors.spec b/lm_sensors.spec
index 24b1533..0775ca3 100644
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -24,7 +24,7 @@ Requires(post): chkconfig
 Requires(post): /sbin/ldconfig
 BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex
 BuildRequires: rrdtool-devel
-ExclusiveArch: alpha %{ix86} x86_64
+ExcludeArch:   s390 s390x
 
 %description
 The lm_sensors package includes a collection of modules for general SMBus
@@ -140,7 +140,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sensors.conf
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_mandir}/man*/*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 %{_sbindir}/*
 %{_initrddir}/lm_sensors
 %config(noreplace) %{_sysconfdir}/sysconfig/lm_sensors
@@ -151,6 +153,7 @@ fi
 %defattr(-,root,root)
 %{_includedir}/sensors
 %{_libdir}/lib*.so
+%{_mandir}/man3/*
 
 %files sensord
 %defattr(-,root,root,-)
@@ -166,6 +169,10 @@ fi
 
 
 %changelog
+- Move libsensors.3 manpage to -devel sub-package
+- Switch from ExclusiveArch: alph ix86 x86_64, to ExcludeArch: s390 s390x,
+  so that we get build on ppc, arm, etc. too. (bz 181037 amongst others)
+
 * Mon Jul  9 2007 Hans de Goede <j.w.r.degoede@hhs.nl> - 2.10.3-3
 - Remove no longer needed patches 1, 2 & 6
 - Various specfile cleanups to match the Fedora packaging guidelines