diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92693053..5f7c52e8 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.8.6 - TBD
+## 2.8.6 - 2019-08-11
 
 ### Added
 
diff --git a/composer.json b/composer.json
index 31d420b0..94e77b8e 100644
--- a/composer.json
+++ b/composer.json
@@ -58,8 +58,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.8-dev",
-            "dev-develop": "2.9-dev"
+            "dev-master": "2.8.x-dev",
+            "dev-develop": "2.9.x-dev"
         },
         "zf": {
             "component": "Zend\\Session",
diff --git a/composer.lock b/composer.lock
index 3fd3a4c3..0e6da8b3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d00e1bc4c6f2029ba82cfd344c09c999",
+    "content-hash": "4f244db6869aeb90fc4cf8a40f9b3bfe",
     "packages": [
         {
             "name": "zendframework/zend-eventmanager",
@@ -909,8 +909,8 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "role": "lead",
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Simple template engine.",
@@ -958,8 +958,8 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
+                    "role": "lead",
+                    "email": "sb@sebastian-bergmann.de"
                 }
             ],
             "description": "Utility class for timing",
@@ -1761,8 +1761,8 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "role": "lead",
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
diff --git a/docs/book/index.html b/docs/book/index.html
deleted file mode 100644
index c8d118b0..00000000
--- a/docs/book/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="container">
-  <div class="jumbotron">
-    <h1>zend-session</h1>
-
-    <p>Object-oriented interface to PHP sessions and storage.</p>
-
-    <pre><code class="language-bash">$ composer require zendframework/zend-session</code></pre>
-  </div>
-</div>
-
diff --git a/docs/book/manager.md b/docs/book/manager.md
index eb0cdb5d..82db9dc4 100644
--- a/docs/book/manager.md
+++ b/docs/book/manager.md
@@ -49,6 +49,8 @@ The following illustrates how you might utilize the above configuration to
 create the session manager:
 
 ```php
+use Zend\Mvc\ModuleRouteListener;
+use Zend\Mvc\MvcEvent;
 use Zend\Session\SessionManager;
 use Zend\Session\Config\SessionConfig;
 use Zend\Session\Container;
@@ -56,7 +58,7 @@ use Zend\Session\Validator;
 
 class Module
 {
-    public function onBootstrap($e)
+    public function onBootstrap(MvcEvent $e)
     {
         $eventManager        = $e->getApplication()->getEventManager();
         $moduleRouteListener = new ModuleRouteListener();
@@ -64,7 +66,7 @@ class Module
         $this->bootstrapSession($e);
     }
 
-    public function bootstrapSession($e)
+    public function bootstrapSession(MvcEvent $e)
     {
         $session = $e->getApplication()
             ->getServiceManager()
@@ -100,14 +102,15 @@ class Module
 
         foreach ($sessionConfig['validators'] as $validator) {
             switch ($validator) {
-            case Validator\HttpUserAgent::class:
+                case Validator\HttpUserAgent::class:
                     $validator = new $validator($container->httpUserAgent);
                     break;
-                    case Validator\RemoteAddr::class:
+                case Validator\RemoteAddr::class:
                     $validator  = new $validator($container->remoteAddr);
                     break;
                 default:
                     $validator = new $validator();
+                    break;
             }
 
             $chain->attach('session.validate', array($validator, 'isValid'));
diff --git a/mkdocs.yml b/mkdocs.yml
index f0240d97..f5b4e201 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,7 +1,7 @@
 docs_dir: docs/book
 site_dir: docs/html
 pages:
-    - index.md
+    - Home: index.md
     - Reference:
         - "Session Config": config.md
         - "Session Container": container.md
@@ -10,6 +10,5 @@ pages:
         - "Session Storage": storage.md
         - "Session Validators": validator.md
 site_name: zend-session
-site_description: zend-session
+site_description: 'Object-oriented interface to PHP sessions and storage.'
 repo_url: 'https://github.com/zendframework/zend-session'
-copyright: 'Copyright (c) 2005-2017 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'