diff --git a/s390-tools-1.36.0-zipl-flags.patch b/s390-tools-1.37.1-zipl-flags.patch
similarity index 79%
rename from s390-tools-1.36.0-zipl-flags.patch
rename to s390-tools-1.37.1-zipl-flags.patch
index da642fe..540bf6e 100644
--- a/s390-tools-1.36.0-zipl-flags.patch
+++ b/s390-tools-1.37.1-zipl-flags.patch
@@ -1,4 +1,4 @@
-From 584fd01d78e94d98ea2cb21954789fcc844fabcb Mon Sep 17 00:00:00 2001
+From 570170919f5f657db3aa0db8e403fe26917c5077 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
 Date: Fri, 22 Apr 2016 13:21:50 +0200
 Subject: [PATCH] zipl: disable strict aliasing for bootloader
@@ -8,7 +8,7 @@ Subject: [PATCH] zipl: disable strict aliasing for bootloader
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile
-index bb8a19d..f1f4401 100644
+index 4908062..6474aad 100644
 --- a/zipl/boot/Makefile
 +++ b/zipl/boot/Makefile
 @@ -4,7 +4,7 @@ include ../../common.mak
@@ -18,8 +18,8 @@ index bb8a19d..f1f4401 100644
 -	  -fno-delete-null-pointer-checks \
 +	  -fno-delete-null-pointer-checks -fno-strict-aliasing \
  	  -fexec-charset=IBM1047 -m64 -mpacked-stack \
- 	  -mstack-size=8192 -mstack-guard=128 -msoft-float $(WARNFLAGS)
- 
+ 	  -mstack-size=8192 -mstack-guard=128 -msoft-float \
+ 	  -W -Wall -Wformat-security
 -- 
 2.7.4
 
diff --git a/s390utils.spec b/s390utils.spec
index bc90c06..500f671 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -4,8 +4,8 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
-Version:        1.36.1
-Release:        2%{?dist}
+Version:        1.37.1
+Release:        1%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 ExclusiveArch:  s390 s390x
@@ -32,7 +32,7 @@ Source17:       ccw.udev
 Source19:       mon_statd.initd
 Source21:       normalize_dasd_arg
 
-Patch1:         s390-tools-1.36.0-zipl-flags.patch
+Patch1:         s390-tools-1.37.1-zipl-flags.patch
 
 Patch1000:      cmsfs-1.1.8-warnings.patch
 Patch1001:      cmsfs-1.1.8-kernel26.patch
@@ -154,7 +154,7 @@ popd
 
 # install usefull headers for devel subpackage
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
-install -p -m 644 include/vtoc.h $RPM_BUILD_ROOT%{_includedir}/%{name}
+install -p -m 644 include/lib/vtoc.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 
 # CPI
 install -p -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/cpi
@@ -308,8 +308,6 @@ s390 base tools. This collection provides the following utilities:
                    adapters.
      - cio_ignore: Query and modify the contents of the CIO device driver
                    blacklist.
-     - lsmem:      Display the online status of the available memory.
-     - chmem:      Set hotplug memory online or offline.
 
    * dumpconf:
      Allows to configure the dump device used for system dump in case a kernel
@@ -386,11 +384,11 @@ fi
 %{_sbindir}/dbginfo.sh
 %{_bindir}/lscpumf
 %{_sbindir}/lsluns
-%{_sbindir}/lsmem
+%exclude %{_sbindir}/lsmem
 %{_sbindir}/lsreipl
 %{_sbindir}/lsshut
 %{_sbindir}/chcpumf
-%{_sbindir}/chmem
+%exclude %{_sbindir}/chmem
 %{_sbindir}/chreipl
 %{_sbindir}/chshut
 %{_sbindir}/ip_watcher.pl
@@ -399,6 +397,7 @@ fi
 %{_sbindir}/xcec-bridge
 %{_sbindir}/hyptop
 %{_bindir}/vmconvert
+%{_bindir}/dump2tar
 %{_initddir}/dumpconf
 %ghost %config(noreplace) %{_sysconfdir}/zipl.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
@@ -407,12 +406,13 @@ fi
 %{_mandir}/man1/zfcpdbf.1*
 %{_mandir}/man1/lscpumf.1*
 %{_mandir}/man1/vmconvert.1*
+%{_mandir}/man1/dump2tar.1*
 %{_mandir}/man4/prandom.4*
 %{_mandir}/man5/zipl.conf.5*
 %{_mandir}/man8/chccwdev.8*
 %{_mandir}/man8/chchp.8*
 %{_mandir}/man8/chcpumf.8*
-%{_mandir}/man8/chmem.8*
+%exclude %{_mandir}/man8/chmem.8*
 %{_mandir}/man8/chreipl.8*
 %{_mandir}/man8/chshut.8*
 %{_mandir}/man8/chzcrypt.8*
@@ -428,7 +428,7 @@ fi
 %{_mandir}/man8/lschp.8*
 %{_mandir}/man8/lscss.8*
 %{_mandir}/man8/lsdasd.8*
-%{_mandir}/man8/lsmem.8*
+%exclude %{_mandir}/man8/lsmem.8*
 %{_mandir}/man8/lsluns.8*
 %{_mandir}/man8/lsqeth.8*
 %{_mandir}/man8/lsreipl.8*
@@ -809,6 +809,10 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Fri May 19 2017 Dan Horák <dan[at]danny.cz> - 2:1.37.1-1
+- rebased to 1.37.1
+- removed chmem/lsmem as they are now provided by util-linux >= 2.30 (#1452792)
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.36.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 6ad7eed..29b881a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-71a8ee5918f2c44c385fcfe8350cdc98  cmsfs-1.1.8c.tar.gz
-6011b33227d843a6e2f8144331f4b3d4  src_vipa-2.1.0.tar.gz
-d43e50471c7d2657afabb378c36ebb9e  s390-tools-1.36.1.tar.bz2
+SHA512 (cmsfs-1.1.8c.tar.gz) = 2ba5687d378fdd9871283728e81f1399047e74f9bba3936726eda11a978fe6ced1a300f15acb871d5daa26e61069d89767c753cf584f2731f5e99985db96aef0
+SHA512 (src_vipa-2.1.0.tar.gz) = 8f6048e82b4bcc479dfb09d62da64b9519f66efc31889ff795ee6ca107e262167df57628c305f1b899c41bb3f035e6309552d8548c890855d319e8e60d6a6cf7
+SHA512 (s390-tools-1.37.1.tar.bz2) = 43a255171956aad3d04e666a2ab949f392bb8d8faca0a8f8a4714f9eabbc93e625ed0ec0cae69f05ef6a3ab86982de2a757184b771b60e927d86c931fb5cdf89