diff --git a/daps-2.4.0.tar.bz2 b/daps-2.4.0.tar.bz2
index 4e74165..62e079d 100644
--- a/daps-2.4.0.tar.bz2
+++ b/daps-2.4.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4356a0187169821f1a9fd723a9da0f857bec32129c2a1c86538136e3fe95a58
-size 2368347
+oid sha256:8d0f5e3434fa832e28e44c7afbb4b6755f963cf9870865e97b38df5bd4f9e4e3
+size 2368834
diff --git a/daps.changes b/daps.changes
index b4bde31..e79db8b 100644
--- a/daps.changes
+++ b/daps.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jun 14 14:26:38 UTC 2017 - fsundermeyer@opensuse.org
+
+Hotfix for 2.4.0:
+
+- fixed fatal typo in lib/daps-functions
+- fixed spelling/grammar issues in error messages
+
+Changelog:
+
+- merged SLE 12 and Factory Changelogs
+
 -------------------------------------------------------------------
 Tue May 30 11:28:44 UTC 2017 - fsundermeyer@opensuse.org
 
@@ -62,11 +74,19 @@ Wed Oct  5 15:35:16 UTC 2016 - sknorr@suse.com
 - Try to fix broken link
 - Remove SVN fetch source script
 
+-------------------------------------------------------------------
+Tue Aug  9 10:01:37 UTC 2016 - fs@suse.com
+
+- Increased the Java Stacksize for jing to 4096k since otherwise
+  building manuals on s390x is failing, see bsc#992755
+
 -------------------------------------------------------------------
 Fri Aug 04 12:36:01 UTC 2016 - fsundermeyer@opensuse.org
 
 Stable release DAPS 2.3.0:
 
+Just to please the SLES submission bot: bsc#992546
+
 * New Features:
   - Config File Parser:
     Up to now, config files (DC-files, /tec/daps/config and