diff --git a/ChangeLog b/ChangeLog
index 1b90c6cc8..030c2532b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
++ openCryptoki 3.23
+- EP11: Add support for FIPS-session mode
+- Updates to harden against RSA timing attacks
+- Bug fixes
+
 + openCryptoki 3.22
 - CCA: Add support for the AES-XTS key type using CPACF protected keys
 - p11sak: Add support for managing certificate objects
diff --git a/README.md b/README.md
index 765db0e52..a835d6cbd 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@
 
 # openCryptoki
 
-Package version 3.22
+Package version 3.23
 
 Please see [ChangeLog](ChangeLog) for release specific information.
 
 ## OVERVIEW
 
-openCryptoki version 3.22 implements the PKCS#11 specification version 3.0.
+openCryptoki version 3.23 implements the PKCS#11 specification version 3.0.
 
 This package includes several cryptographic tokens:
 CCA, ICA, TPM , SWToken, ICSF and EP11.
@@ -53,7 +53,7 @@ directory and do the following:
     $ ./bootstrap.sh
 ```
 
-** Note: ** This package used the `AX_PROG_CC_FOR_BUILD` autoconf macro
+**Note:** This package used the `AX_PROG_CC_FOR_BUILD` autoconf macro
 from the autoconf archive to support cross compiler builds.
 If your system does not provide this macro, you might need to install the
 `autoconf-archive` package or download the macro and place it into the
diff --git a/configure.ac b/configure.ac
index 4e73ca881..d2fcb2953 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.69])
-AC_INIT([openCryptoki],[3.22.0],[https://github.com/opencryptoki/opencryptoki/issues],[],[https://github.com/opencryptoki/opencryptoki])
+AC_INIT([openCryptoki],[3.23],[https://github.com/opencryptoki/opencryptoki/issues],[],[https://github.com/opencryptoki/opencryptoki])
 AC_CONFIG_SRCDIR([testcases/common/common.c])
 
 dnl Needed for $target!
diff --git a/rpm/opencryptoki.spec b/rpm/opencryptoki.spec
index 918a93d84..ee06ba6df 100644
--- a/rpm/opencryptoki.spec
+++ b/rpm/opencryptoki.spec
@@ -2,7 +2,7 @@
 
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v3.0
-Version:		3.22.0
+Version:		3.23.0
 Release:		1%{?dist}
 License:		CPL
 Group:			System Environment/Base
diff --git a/testcases/ciconfig.sh b/testcases/ciconfig.sh
index f9d60eded..3befbc7f6 100755
--- a/testcases/ciconfig.sh
+++ b/testcases/ciconfig.sh
@@ -76,7 +76,7 @@ else
 fi
 
 # initialize opencryptoki.conf
-echo "version opencryptoki-3.22" > "${OCKCONFDIR}/opencryptoki.conf"
+echo "version opencryptoki-3.23" > "${OCKCONFDIR}/opencryptoki.conf"
 
 # enable full statistics
 echo "statistics (on,implicit,internal)" >> "${OCKCONFDIR}/opencryptoki.conf"
diff --git a/usr/sbin/pkcsslotd/opencryptoki.conf b/usr/sbin/pkcsslotd/opencryptoki.conf
index 297210f6e..944ccdb23 100644
--- a/usr/sbin/pkcsslotd/opencryptoki.conf
+++ b/usr/sbin/pkcsslotd/opencryptoki.conf
@@ -1,4 +1,4 @@
-version opencryptoki-3.22
+version opencryptoki-3.23
 
 # The following defaults are defined:
 #	hwversion = "0.0"