diff --git a/CHANGELOG b/CHANGELOG
index f8c7c32..8aa51bd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+2020-06-12
+    - 2.12.5
+    - [BUGFIX] ID-28: do not use TLS middlebox compatibility mode in
+      ClientHello.  This change requires using a newer version of BoringSSL.
+    - [BUGFIX] Free connections in Advisory Tick Time Queue in engine dtor.
+    - [BUGFIX] HTTP/3 headers may be followed immediately by trailers.
+    - [BUGFIX] Log messages when SCID changes.
+
 2020-06-04
     - 2.12.4
     - [BUGFIX] Don't double-count tag length in amplification logic.
diff --git a/docs/conf.py b/docs/conf.py
index 08087cc..755ddbc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@ author = u'LiteSpeed Technologies'
 # The short X.Y version
 version = u'2.12'
 # The full version, including alpha/beta/rc tags
-release = u'2.12.4'
+release = u'2.12.5'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/include/lsquic.h b/include/lsquic.h
index 92b96c5..d0fe1e8 100644
--- a/include/lsquic.h
+++ b/include/lsquic.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #define LSQUIC_MAJOR_VERSION 2
 #define LSQUIC_MINOR_VERSION 12
-#define LSQUIC_PATCH_VERSION 4
+#define LSQUIC_PATCH_VERSION 5
 
 /**
  * Engine flags: