diff --git a/AUTHORS b/AUTHORS
index 5aa6e025..de79c770 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,5 +24,9 @@ Dominik Fischer <dom_fischer@web.de>
 Ville Skyttä <vskytta@gmail.com>
 	Original pam_pkcs11.spec file
 
+Paul Wolneykien <manowar@altlinux.org>
+	Additional features and fixes (card_only, wait_for_card, openssl
+	versions).
+
 Also Thanks to all the people at the OpenSC project
 
diff --git a/ChangeLog b/ChangeLog
index bad58b5e..9061fd10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+31- May 2021
+    - Version 0.6.12
+    - Limit signature length to 65536 bytes.
+    - Workaround for buggy PKCS#11 C_Sign() implementation that always
+      returns the same signature length along with
+      CKR_BUFFER_TOO_SMALL.
+    - Don't stuck if wait_for_card=false and ignore the token not found
+      error when the authentication isn't restricted to card only
+      (either by the option `card_only` or by PKCS11_LOGIN_TOKEN_NAME
+      environment variable).
+    - Added the exmple PAM configuration which uses the ignore status
+      result.
+    - Added `screen_savers` to example config.
+    - Fixes to deal with old and new OpenSSL versions.
+    - Various small fixes including type casts and printf() formats.
+
 22- May 2019
     - Version 0.6.11
     - Support OpenSSL 1.1.0
diff --git a/README b/README
index 848df3d1..9cff3fbd 100644
--- a/README
+++ b/README
@@ -5,6 +5,7 @@ Authors:  Mario Strasser <mast@gmx.net>
           Juan Antonio Martinez <jonsito@teleline.es>
           Ludovic Rouseau <ludovic.rousseau@free.fr>
 		  Frank Morgner <frankmorgner@gmail.com>
+          Paul Wolneykien <manowar@altlinux.org>
 
 This Linux-PAM login module allows a X.509 certificate based user
 login. The certificate and its dedicated private key are thereby
diff --git a/configure.ac b/configure.ac
index 3fb4b6a0..2484558e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ([2.69])
 
 # Process this file with autoconf to produce a configure script.
-AC_INIT([pam_pkcs11],[0.6.11])
+AC_INIT([pam_pkcs11],[0.6.12])
 AC_CONFIG_SRCDIR([src/pam_pkcs11/pam_pkcs11.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE