diff --git a/VERSION b/VERSION
index 07b26572f..3ace8b4bf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.2.22
+5.2.23
diff --git a/changelog.md b/changelog.md
index d34138af7..5256844be 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,13 @@
 # ChangeLog
 
+## Version 5.2.23 (March 15th 2017)
+* Improve trapping of TLS errors during connection so that they don't cause warnings, and are reported better in debug output
+* Amend test suite so it uses PHPUnit version 4.8, compatible with older versions of PHP, instead of teh version supplied by Travis-CI
+* This forces pinning of some dev packages to older releases, but should make travis builds more reliable
+* Test suite now runs on HHVM, and thus so should PHPMailer in general
+* Improve Czech translations
+* Add links to CVE-2017-5223 resources
+
 ## Version 5.2.22 (January 5th 2017)
 * **SECURITY** Fix [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223), local file disclosure vulnerability if content passed to `msgHTML()` is sourced from unfiltered user input. Reported by Yongxiang Li of Asiasecurity. The fix for this means that calls to `msgHTML()` without a `$basedir` will not import images with relative URLs, and relative URLs containing `..` will be ignored.
 * Add simple contact form example
diff --git a/class.phpmailer.php b/class.phpmailer.php
index 477ee826e..1b31ec14c 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -31,7 +31,7 @@ class PHPMailer
      * The PHPMailer Version number.
      * @var string
      */
-    public $Version = '5.2.22';
+    public $Version = '5.2.23';
 
     /**
      * Email priority.
diff --git a/class.pop3.php b/class.pop3.php
index f10e688e3..c464f90c6 100644
--- a/class.pop3.php
+++ b/class.pop3.php
@@ -34,7 +34,7 @@ class POP3
      * @var string
      * @access public
      */
-    public $Version = '5.2.22';
+    public $Version = '5.2.23';
 
     /**
      * Default POP3 port number.
diff --git a/class.smtp.php b/class.smtp.php
index d3d869788..01cee8209 100644
--- a/class.smtp.php
+++ b/class.smtp.php
@@ -30,7 +30,7 @@ class SMTP
      * The PHPMailer SMTP version number.
      * @var string
      */
-    const VERSION = '5.2.22';
+    const VERSION = '5.2.23';
 
     /**
      * SMTP line break constant.
@@ -81,7 +81,7 @@ class SMTP
      * @deprecated Use the `VERSION` constant instead
      * @see SMTP::VERSION
      */
-    public $Version = '5.2.22';
+    public $Version = '5.2.23';
 
     /**
      * SMTP server port number.