diff --git a/.gitignore b/.gitignore
index 21d0322..b54c248 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ src_vipa-2.0.4.tar.gz
 /s390-tools-2.1.0.tar.gz
 /s390-tools-2.2.0.tar.gz
 /s390-tools-2.3.0.tar.gz
+/s390-tools-2.4.0.tar.gz
diff --git a/s390utils.spec b/s390utils.spec
index 08d8f85..81d16e8 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -4,8 +4,8 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
 Group:          System Environment/Base
-Version:        2.3.0
-Release:        3%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Epoch:          2
 License:        MIT
 ExclusiveArch:  s390 s390x
@@ -788,6 +788,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Wed May 09 2018 Dan Horák <dan[at]danny.cz> - 2:2.4.0-1
+- rebased to 2.4.0
+
 * Fri Apr 13 2018 Dan Horák <dan[at]danny.cz> - 2:2.3.0-3
 - fix building zipl with PIE (#1566140)
 
diff --git a/sources b/sources
index 691ee52..7f7c4fa 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (cmsfs-1.1.8c.tar.gz) = 2ba5687d378fdd9871283728e81f1399047e74f9bba3936726eda11a978fe6ced1a300f15acb871d5daa26e61069d89767c753cf584f2731f5e99985db96aef0
 SHA512 (src_vipa-2.1.0.tar.gz) = 8f6048e82b4bcc479dfb09d62da64b9519f66efc31889ff795ee6ca107e262167df57628c305f1b899c41bb3f035e6309552d8548c890855d319e8e60d6a6cf7
-SHA512 (s390-tools-2.3.0.tar.gz) = a4733eda8ba55bacfd07b000abe72e1f17f0ece774205649ae97115646253231230d2dc579d83d6f2018cc88d7c9240862e37387d1f18dac2928938b09605838
+SHA512 (s390-tools-2.4.0.tar.gz) = de4d89f505567fe313df3c9110242d9476d0e20ff9b6f31ecbaa99c8a4e2b4bc959ab29ec6faf8b47c4e669f2eaa736f29a9e9908c95ced2e33db25b1c620c84