diff --git a/AUTHORS.md b/AUTHORS.md
index a25880a8..002a8baf 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -45,6 +45,7 @@ List of all individuals having contributed content to s390-tools
 - Jan Glauber
 - Jan Hoeppner
 - Jan Willeke
+- Javier Martinez Canillas
 - Jean-Baptiste Joret
 - Jens Remus
 - Jochen Roehrig
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eed8badb..16dcce0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,13 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------
- * __v2.4.1 (XXXX-XX-XX)__
+ * __v2.5.0 (2018-06-08)__
 
   For Linux kernel version: 4.17
 
   Changes of existing tools:
+  - zdev: Add support for reading firmware configuration files
+  - zipl: Add BootLoaderSpec support
+  - scripts: Add script to switch zipl config to a BootLoaderSpec setup
 
   Bug Fixes:
   - lsluns: Print a message if no adapter or port exists
diff --git a/common.mak b/common.mak
index ee424c5d..9bd613fb 100644
--- a/common.mak
+++ b/common.mak
@@ -5,7 +5,7 @@ COMMON_INCLUDED = true
 # The variable "DISTRELEASE" should be overwritten in rpm spec files with:
 # "make DISTRELEASE=%{release}" and "make install DISTRELEASE=%{release}"
 VERSION            = 2
-RELEASE            = 4
+RELEASE            = 5
 PATCHLEVEL         = 0
 DISTRELEASE        = build-$(shell date +%Y%m%d)
 S390_TOOLS_RELEASE = $(VERSION).$(RELEASE).$(PATCHLEVEL)-$(DISTRELEASE)