diff --git a/CHANGELOG.md b/CHANGELOG.md
index e36b9ea..50ac2b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.6.1 - TBD
+## 2.6.1 - 2017-01-16
 
 ### Added
 
diff --git a/composer.json b/composer.json
index 429b8d3..3be2356 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     },
     "require-dev": {
         "zendframework/zend-mail": "^2.6",
-        "phpunit/PHPUnit": "~4.0",
+        "phpunit/PHPUnit": "^4.7 || ^5.7",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "suggest": {
diff --git a/doc/book/message.md b/doc/book/message.md
index d61e34e..79a7a69 100644
--- a/doc/book/message.md
+++ b/doc/book/message.md
@@ -46,6 +46,13 @@ strings and returning a `Zend\Mime\Message` instance:
 $message = Zend\Mime\Message::createFromMessage($string, $boundary);
 ```
 
+As of version 2.6.1, You may also parse a single-part message by omitting the
+`$boundary` argument:
+
+```php
+$message = Zend\Mime\Message::createFromMessage($string);
+```
+
 ## Available methods
 
 `Zend\Mime\Message` contains the following methods: