diff --git a/.gitignore b/.gitignore
index 30019a3..7a912b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /iprutils-2.4.12.1.tar.gz
 /iprutils-2.4.14.1.tar.gz
 /iprutils-2.4.15.1.tar.gz
+/iprutils-2.4.16.1.tar.gz
diff --git a/iprutils.spec b/iprutils.spec
index 8a7a609..9477b2e 100644
--- a/iprutils.spec
+++ b/iprutils.spec
@@ -1,11 +1,11 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name:    iprutils
-Version: 2.4.15.1
-Release: 4%{?dist}
+Version: 2.4.16.1
+Release: 1%{?dist}
 License: CPL
 Group:   System Environment/Base
 URL:     http://sourceforge.net/projects/iprdd/
-Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.15/%{name}-%{version}.tar.gz
+Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.16/%{name}-%{version}.tar.gz
 
 # missing man page
 Source1: iprdbg.8.gz
@@ -13,48 +13,45 @@ Source1: iprdbg.8.gz
 # sent to upstream
 Patch0:  0001-Service-start-is-controled-by-udev-rule.patch
 
-Requires: /sbin/pidof
-
 BuildRequires: ncurses-devel
 BuildRequires: libcap-devel
 BuildRequires: kernel-headers
 BuildRequires: systemd
-BuildRequires: python2-devel
 BuildRequires: zlib-devel
 
-Obsoletes: ipr-utils
 
 %description
 Provides a suite of utilities to manage and configure SCSI devices
 supported by the ipr SCSI storage device driver.
 
+
 %prep
-%setup -q
-%patch0 -p1 -b .udev
+%autosetup -p1
+
 
 %build
-export CFLAGS="%{optflags} -fPIE -Wl,-z,relro,-z,now"
-export LDFLAGS="-pie"
-%configure
-%{__make} %{?_smp_mflags}
+%configure --with-systemd --disable-static --disable-sosreport
+%{make_build}
+
 
 %install
-%{__make} DESTDIR=%{buildroot} install
+%{make_install}
 
 # iprutils.target
-%{__install} -m 0644 systemd/iprutils.target %{buildroot}/%{_unitdir}/iprutils.target
+install -p -m 0644 systemd/iprutils.target %{buildroot}/%{_unitdir}/iprutils.target
 
 mkdir -p %{buildroot}/%{_udevrulesdir}
-%{__install} -m 0644 udev/rules.d/90-iprutils.rules %{buildroot}/%{_udevrulesdir}/90-iprutils.rules
+install -p -m 0644 udev/rules.d/90-iprutils.rules %{buildroot}/%{_udevrulesdir}/90-iprutils.rules
 
 # missing man page
-%{__install} -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/
+install -p -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/
 
 #install bash completion
-%{__mv} %{buildroot}/%{_sysconfdir}/bash_completion.d/{iprconfig-bash-completion.sh,iprconfig}
+mv %{buildroot}/%{_sysconfdir}/bash_completion.d/{iprconfig-bash-completion.sh,iprconfig}
 
 # Remove temporary files and scripts that will not be packaged.
-%{__rm} %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha
+rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha
+
 
 %post
 %systemd_post iprinit.service
@@ -69,18 +66,23 @@ mkdir -p %{buildroot}/%{_udevrulesdir}
 %systemd_preun iprutils.target
 
 %files
-%doc README LICENSE
+%license LICENSE
+%doc README
 %{_sbindir}/*
 %{_sysconfdir}/bash_completion.d/
-#fix permissions
-%attr(0644,root,root) %{_mandir}/man*/*
+%{_mandir}/man*/*
 %{_unitdir}/iprinit.service
 %{_unitdir}/iprdump.service
 %{_unitdir}/iprupdate.service
 %{_unitdir}/iprutils.target
 %{_udevrulesdir}/90-iprutils.rules
- 
+
+
 %changelog
+* Fri May 11 2018 Dan Horák <dan[at]danny.cz> - 2.4.16.1-1
+- rebased to 2.4.16.1
+- spec file cleanup
+
 * Thu Mar 15 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.4.15.1-4
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
diff --git a/sources b/sources
index 5b3bb90..78f2983 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (iprutils-2.4.15.1.tar.gz) = 34987356c989ccfcb462153eb7d3792c770a04f4ef14406073dfec4895598e5e7968050e17d2b6d057659c2c57be68406911d9abbc1b820980685ed27ea83dad
+SHA512 (iprutils-2.4.16.1.tar.gz) = 9eb69689bfd6821a69f8cfb550f007a2b5359f5d38652d61c74aff04e2b7acf1c7e8d32492dc3e6da0876de5d2338eba36100f4b2ded04e932d1ddf36ad9c171