diff --git a/hwloc.spec b/hwloc.spec
index 93694be..e225ab2 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,14 +1,17 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
 Version:   1.4
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://www.open-mpi.org/projects/hwloc/
 Source0:   http://www.open-mpi.org/software/hwloc/v1.3/downloads/%{name}-%{version}.tar.bz2
 #Patch0:    hwloc-1.2.1.patch
 
-BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel libibverbs-devel pciutils-devel transfig doxygen w3m
+BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel pciutils-devel transfig doxygen w3m
+%ifnarch s390 s390x
+BuildRequires: libibverbs-devel
+%endif
 %ifnarch s390 s390x %{arm}
 BuildRequires: numactl-devel
 %endif
@@ -89,18 +92,25 @@ Headers and shared object symbolic links for the hwloc.
 
 
 %changelog
+* Thu Apr 12 2012 Dan Horák <dan[at]danny.cz> - 1.4-2
+- no InfiniBand on s390(x)
+
 * Wed Feb 14 2012 Jirka Hladky  <hladky.jiri@gmail.com> - 1.4-1
 - Update to 1.4 release
+
 * Mon Nov 14 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.3-1
 - Update build for ARM support
+
 * Sat Oct 15 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.3-0
  - 1.3 release
  - added dependency on libibverbs-devel pciutils-devel
  - cannot provide support for cuda (cuda_runtime_api.h). 
  - Nvidia CUDA is free but not open-source therefore not in Fedora. 
+
 * Fri Oct 07 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.2.2-1
  - moved *.so to the devel package
  - libhwloc*so* in the main package
+
 * Wed Oct 05 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.2.2-0
 - 1.2.2 release
 - Fix for BZ https://bugzilla.redhat.com/show_bug.cgi?id=724937 for 32-bit PPC