From 60c687238dcf56d536c60492d4c81399adcf3700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B6ppner?= <hoeppner@linux.ibm.com>
Date: Fri, 10 Aug 2018 10:31:37 +0200
Subject: [PATCH] New release s390-tools-2.6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 AUTHORS.md   | 1 +
 CHANGELOG.md | 4 +++-
 common.mak   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 002a8baf..c1de09f0 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -16,6 +16,7 @@ List of all individuals having contributed content to s390-tools
 - Clemens von Mann
 - Dan Horak
 - Despina Papadopoulou
+- Dimitri John Ledkov
 - Eberhard Pasch
 - Einar Lueck
 - Erwin Vicari
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cabc68c5..54303086 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,11 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------
- * __v2.5.1 (XXXX-XX-XX)__
+ * __v2.6.0 (2018-08-10)__
 
   For Linux kernel version: 4.18
 
+  Add new tool:
+  - zkey: Add zkey-cryptsetup tool
   Changes of existing tools:
   - netboot: add BOOTIF support
 
diff --git a/common.mak b/common.mak
index 9bd613fb..571fb30d 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            = 5
+RELEASE            = 6
 PATCHLEVEL         = 0
 DISTRELEASE        = build-$(shell date +%Y%m%d)
 S390_TOOLS_RELEASE = $(VERSION).$(RELEASE).$(PATCHLEVEL)-$(DISTRELEASE)