diff --git a/VERSION b/VERSION
index 6d54bbd77..7a9f89d81 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.1
\ No newline at end of file
+6.0.2
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index 198725e4e..f814e5fc9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,12 +1,17 @@
 # PHPMailer Change Log
 
+## Version 6.0.2 (November 29th 2017)
 * Don't make max line length depend on line break format
+* Improve Travis-CI config - thanks to Filippo Tessarotto
 * Match SendGrid transaction IDs
 * `idnSupported()` now static, as previously documented
+* Improve error messages for invalid addresses
 * Improve Indonesian translation (thanks to @januridp)
+* Improve Esperanto translation (thanks to @dknacht)
 * Clean up git export ignore settings for production and zip bundles
+* Update license doc
 * Updated upgrading docs
-* Clarify addStringEmbeddedImage docs
+* Clarify `addStringEmbeddedImage` docs
 * Hide auth credentials in all but lowest level debug output, prevents leakage in bug reports
 * Code style cleanup
 
diff --git a/src/PHPMailer.php b/src/PHPMailer.php
index 397adf3ff..c6246207a 100644
--- a/src/PHPMailer.php
+++ b/src/PHPMailer.php
@@ -669,7 +669,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.0.1';
+    const VERSION = '6.0.2';
 
     /**
      * Error severity: message only, continue processing.
diff --git a/src/POP3.php b/src/POP3.php
index 9ab47192a..e36393df3 100644
--- a/src/POP3.php
+++ b/src/POP3.php
@@ -45,7 +45,7 @@ class POP3
      *
      * @var string
      */
-    const VERSION = '6.0.1';
+    const VERSION = '6.0.2';
 
     /**
      * Default POP3 port number.
diff --git a/src/SMTP.php b/src/SMTP.php
index 327fb4489..fe1992906 100644
--- a/src/SMTP.php
+++ b/src/SMTP.php
@@ -34,7 +34,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.0.1';
+    const VERSION = '6.0.2';
 
     /**
      * SMTP line break constant.