diff --git a/AUTHORS.md b/AUTHORS.md
index 44eae43b..3f807c42 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -98,6 +98,7 @@ List of all individuals having contributed content to s390-tools
 - Thomas Richter
 - Thomas Spatzier
 - Thomas Weber
+- Tuan Hoang
 - Ursula Braun
 - Utz Bacher
 - Vasily Gorbik
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2652b11..fef4474c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,32 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------
- * __v2.11.x (2019-xx-xx)__
+ * __v2.12.0 (2019-12-17)__
 
-  For Linux kernel version: 5.x
+  For Linux kernel version: 5.4
 
   Changes of existing tools:
   - dbginfo: Gather qdisc related data (using 'tc')
   - dbginfo: Gather extended network statistics (using 'ip link')
+  - dbginfo: Collect all files under /usr/lib/systemd/system/
+  - cpumf/cpumf_helper: Add IBM z15 machine name
+  - zkey: Display MKVP when validating a secure key
+  - zkey: Cross check APQNs when generating, validating, or importing secure keys,
+      and when changing APQN associations
+  - zkey: Check crypto card level during APQN cross checking
+  - zkey: Add support for generating, validating, and re-enciphering AES CIPHER keys
+  - zkey-cryptsetup: Add --to-new and --from-old options
+  - zkey-cryptsetup: Allow setkey to set different key types
+  - lszcrypt/chzcrypt: CEX7S exploitation support
+  - zcryptstats: Add support for CEX7 crypto card
+  - zipl: Ship a minimal zipl.conf
+  - zipl: Add value of target= as search path for BLS case
 
   Bug Fixes:
-
+  - dasdview: Fix exit status in error cases
+  - zipl: Fix various compile warnings
+  - zipl: Fix dependency generation in zipl/boot
+  - zipl: Fix entry point for stand-alone kdump
+  - zipl: Add missing options to help output
 
  * __v2.11.0 (2019-09-06)__
 
diff --git a/common.mak b/common.mak
index 35041e05..d4375c62 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            = 11
+RELEASE            = 12
 PATCHLEVEL         = 0
 DISTRELEASE        = build-$(shell date +%Y%m%d)
 S390_TOOLS_RELEASE = $(VERSION).$(RELEASE).$(PATCHLEVEL)-$(DISTRELEASE)