diff --git a/ChangeLog b/ChangeLog
index d2567176..a91acdf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+1.8.21: Ludovic Rousseau
+20 May 2017
+- SCardCancel():
+  . fix a race condition bug
+  . fix a possible use after free
+  . improve Doxygen documentation
+- SCardGetStatusChange(): fix a race condition when a reader is removed
+- SCardDisconnect(): fix status update for SCARD_UNPOWER_CARD
+- pcsc_stringify_error(): use Thread-local storage
+- pcsc_stringify_error() now returns a const char *
+- SCardControl() may return SCARD_E_INSUFFICIENT_BUFFER when
+  pbRecvBuffer is not big enough to receive the card response.
+- Fix compilation error with GCC 4.9
+- UnitaryTests: add support of Python 3
+- pcsc-spy: add support of Python 3
+- Some other minor improvements
+
+
 1.8.20: Ludovic Rousseau
 30 December 2016
 - Fix a crash and potential security issue in pcscd
diff --git a/configure.ac b/configure.ac
index 8eea5e36..b6fe08e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([pcsc-lite],[1.8.20])
+AC_INIT([pcsc-lite],[1.8.21])
 AC_CONFIG_SRCDIR(src/pcscdaemon.c)
 AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip)
 AC_CONFIG_HEADERS([config.h])