From 617df94ffbbe4ad48df936b2428b47c25ed82682 Mon Sep 17 00:00:00 2001
From: Marcus Bointon <marcus@synchromedia.co.uk>
Date: Thu, 14 Sep 2017 14:50:11 +0200
Subject: [PATCH] 6.0.1

---
 VERSION           |  2 +-
 changelog.md      | 13 ++++++++++++-
 src/PHPMailer.php |  2 +-
 src/POP3.php      |  2 +-
 src/SMTP.php      |  2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index f4965a31..6d54bbd7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0
\ No newline at end of file
+6.0.1
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index 36030be5..c484341b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,17 @@
 # PHPMailer Change Log
 
-## Version 6.0
+## Version 6.0.1 (September 14th 2017)
+* Use shorter Message-ID headers (with more entropy) to avoid iCloud blackhole bug
+* Switch to Symfony code style (though it's not well defined)
+* CI builds now apply syntax & code style checks, so make your PRs tidy!
+* CI code coverage only applied on latest version of PHP to speed up builds (thanks to @Slamdunk for these CI changes)
+* Remove `composer.lock` - it's important that libraries break early; keeping it is for apps
+* Rename test scripts to PSR-4 spec
+* Make content-id values settable on attachments, not just embedded items
+* Add SMTP transaction IDs to callbacks & allow for future expansion
+* Expand test coverage
+
+## Version 6.0 (August 28th 2017)
 This is a major update that breaks backwards compatibility.
 
 * **Requires PHP 5.5 or later**
diff --git a/src/PHPMailer.php b/src/PHPMailer.php
index 54f40cac..4fdfc117 100644
--- a/src/PHPMailer.php
+++ b/src/PHPMailer.php
@@ -669,7 +669,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.0.0';
+    const VERSION = '6.0.1';
 
     /**
      * Error severity: message only, continue processing.
diff --git a/src/POP3.php b/src/POP3.php
index 021f0bda..4e8a5625 100644
--- a/src/POP3.php
+++ b/src/POP3.php
@@ -45,7 +45,7 @@ class POP3
      *
      * @var string
      */
-    const VERSION = '6.0.0';
+    const VERSION = '6.0.1';
 
     /**
      * Default POP3 port number.
diff --git a/src/SMTP.php b/src/SMTP.php
index cb61abcf..8704e2a1 100644
--- a/src/SMTP.php
+++ b/src/SMTP.php
@@ -34,7 +34,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.0.0';
+    const VERSION = '6.0.1';
 
     /**
      * SMTP line break constant.