diff --git a/whatsup.spec b/whatsup.spec
index ba1047d..404b4c9 100644
--- a/whatsup.spec
+++ b/whatsup.spec
@@ -1,6 +1,8 @@
 %global libname libnodeupdown
 
-%ifnarch s390 s390x
+# There is no opensm on 32-bit ARM, bugs #1484155, #1556539
+# There is no libibcommon on s390, s390x
+%ifnarch %{arm} s390 s390x
 %global with_ib 1
 %else
 %global with_ib 0
@@ -9,8 +11,7 @@
 Summary:       Node up/down detection utility
 Name:          whatsup
 Version:       1.14
-Release:       22%{?dist}
-Group:         Applications/Communications
+Release:       23%{?dist}
 License:       GPLv2+
 URL:           https://computing.llnl.gov/linux/whatsup.html
 Source0:       http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}-1/%{name}-%{version}.tar.gz
@@ -37,20 +38,17 @@ and several optional cluster node databases.
 
 %package -n    %{libname}-devel
 Summary:       Development headers for %{libname}
-Group:         Applications/Communications
 Requires:      %{libname} = %{version}-%{release}
 %description -n %{libname}-devel
 development headers for %{libname}
 
 %package -n    %{libname}
 Summary:       A cluster node up/down detection library
-Group:         Applications/Communications
 %description -n %{libname}
 A cluster node up/down detection library, with different backends
 
 %package -n    %{libname}-backend-ganglia
 Summary:       Ganglia backend for %{libname}
-Group:         Applications/Communications
 Requires:      %{libname} = %{version}-%{release}
 BuildRequires: ganglia-devel
 %description -n %{libname}-backend-ganglia
@@ -59,8 +57,7 @@ Ganglia backend module for %{libname}
 %if %{with_ib}
 %package -n    %{libname}-backend-openib
 Summary:       Openib backend for %{libname}
-Group:         Applications/Communications
-BuildRequires: opensm-devel, libibcommon-devel, libibumad-devel
+BuildRequires: opensm-devel, libibcommon-devel, rdma-core-devel
 Requires:      %{libname} = %{version}-%{release}
 %description -n %{libname}-backend-openib
 openib backend module for %{libname}
@@ -68,7 +65,6 @@ openib backend module for %{libname}
 
 %package -n    %{libname}-backend-pingd
 Summary:       Pingd backend for %{libname}
-Group:         Applications/Communications
 Requires:      %{libname} = %{version}-%{release}
 Requires:      %{name}-pingd = %{version}-%{release}
 %description -n %{libname}-backend-pingd
@@ -76,7 +72,6 @@ pingd backend module for %{libname}
 
 %package -n    %{name}-pingd
 Summary:       Pingd daemon for %{name}
-Group:         Applications/Communications
 Requires:      %{libname} = %{version}-%{release}
 %if 0%{?fedora} > 15
 Requires(post): systemd-sysv
@@ -95,7 +90,6 @@ pingd daemon for %{name}
 
 %package -n    perl-%{libname}
 Summary:       Perl bindings for %{libname}
-Group:         Applications/Communications
 Requires:      %{libname} = %{version}-%{release}
 Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %description -n perl-%{libname}
@@ -108,14 +102,12 @@ Perl bindings for %{libname}
 
 %package -n    %{libname}-clusterlist-hostsfile
 Summary:       Hostsfile clusterlist module for %{libname}
-Group:         Applications/Communications
 Requires:      %{libname} = %{version}-%{release}
 %description -n %{libname}-clusterlist-hostsfile
 Hostsfile clusterlist module for %{libname}
 
 %package -n    %{libname}-clusterlist-genders
 Summary:       Genders clusterlist module for %{libname}
-Group:         Applications/Communications
 Requires:      %{libname} = %{version}-%{release}
 %description -n %{libname}-clusterlist-genders
 Genders clusterlist module for %{libname}
@@ -178,13 +170,7 @@ find %{buildroot} -type f -name "*.la" -exec rm -f {} \;
 %{_fixperms} %{buildroot}/*
 touch %{buildroot}%{_sysconfdir}/hostsfile
 
-%if 0%{?rhel} <= 6
-%clean
-rm -rf %{buildroot}
-%endif
-
-%post -n %{libname} -p /sbin/ldconfig
-%postun -n %{libname} -p /sbin/ldconfig
+%ldconfig_scriptlets -n %{libname}
 
 %post -n %{name}-pingd
 %if 0%{?fedora} > 15
@@ -253,14 +239,12 @@ fi
 %endif
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING DISCLAIMER NEWS README ChangeLog
 %{_bindir}/whatsdown
 %{_bindir}/whatsup
 %{_mandir}/man1/*
 
 %files -n perl-%{libname}
-%defattr(-,root,root,-)
 %doc COPYING
 %{_mandir}/man3/Libnodeupdown.3*
 %{_mandir}/man3/Nodeupdown.3*
@@ -268,7 +252,6 @@ fi
 %exclude %dir %{perl_vendorarch}/auto/
 
 %files -n %{name}-pingd
-%defattr(-,root,root,-)
 %doc COPYING
 %if 0%{?fedora} > 15
 %{_unitdir}/%{name}-pingd.service
@@ -285,7 +268,6 @@ fi
 %config(noreplace) %{_sysconfdir}/pingd.conf
 
 %files -n %{libname}-devel
-%defattr(-,root,root,-)
 %doc COPYING
 %{_includedir}/nodeupdown.h
 %dir %{_includedir}/nodeupdown
@@ -294,7 +276,6 @@ fi
 %{_mandir}/man3/nodeupdown*
 
 %files -n %{libname}
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libnodeupdown*.so.*
 %dir %{_libdir}/nodeupdown
@@ -303,35 +284,33 @@ fi
 %config(noreplace) %{_sysconfdir}/nodeupdown.conf
 
 %files -n %{libname}-backend-ganglia
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/nodeupdown/nodeupdown_backend_ganglia.so
 
 %if %{with_ib}
 %files -n %{libname}-backend-openib
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/nodeupdown/nodeupdown_backend_openib.so
 %endif
 
 %files -n %{libname}-backend-pingd
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/nodeupdown/nodeupdown_backend_pingd.so
 
 %files -n %{libname}-clusterlist-genders
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/nodeupdown/nodeupdown_clusterlist_genders.so
 
 %files -n %{libname}-clusterlist-hostsfile
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/nodeupdown/nodeupdown_clusterlist_hostsfile.so
 %config(noreplace) %{_sysconfdir}/hostsfile
 
 
 %changelog
+* Fri May 03 2019 Petr Pisar <ppisar@redhat.com> - 1.14-23
+- Disable InfiniBand support on 32-bit ARM architectures (bug #1556539)
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild