diff --git a/HISTORY.rst b/HISTORY.rst
index 6bc9639a04..1772c2e9c0 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,4 +1,4 @@
-3.1.6 (2018-10-XX)
+3.1.6 (2018-10-09)
 ==================
 * Improve index mirroring value clean up code to remove the spaces at the
   starts and at the end of directories. Closes again GitLab issue #520
diff --git a/__init__.py.tmpl b/__init__.py.tmpl
index ec33b9d2cb..97db90aa33 100644
--- a/__init__.py.tmpl
+++ b/__init__.py.tmpl
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 __title__ = 'Mayan EDMS'
 __version__ = '{{ version }}'
-__build__ = 0x030105
+__build__ = 0x030106
 __build_string__ = '{{ build_string }}'
 __author__ = 'Roberto Rosario'
 __author_email__ = 'roberto.rosario@mayan-edms.com'
diff --git a/docker/version b/docker/version
index 3ad0595adc..9cec7165ab 100755
--- a/docker/version
+++ b/docker/version
@@ -1 +1 @@
-3.1.5
+3.1.6
diff --git a/docs/releases/3.1.6.rst b/docs/releases/3.1.6.rst
new file mode 100644
index 0000000000..15748c6922
--- /dev/null
+++ b/docs/releases/3.1.6.rst
@@ -0,0 +1,90 @@
+===============================
+Mayan EDMS v3.1.6 release notes
+===============================
+
+Released: October 9, 2018
+
+Changes
+~~~~~~~
+* Improve index mirroring value clean up code to remove the spaces at the
+  starts and at the end of directories. Closes again GitLab issue #520
+  Thanks to TheOneValen @ for the report.
+* Improve index mirroring cache class to use the hash of the keys
+  instead of the literal keys. Avoid warning about invalid key
+  characters. Closes GitLab issue #518. Thanks to TheOneValen @ for the
+  report.
+* Only render the Template API view for authenticated users.
+  Thanks rgarcia for the report.
+* Add icon to the cabinet "Add new level" link.
+* Display the cabinet "Add new level" link in the top level view too.
+
+Removals
+--------
+
+* None
+
+Upgrading from a previous version
+---------------------------------
+
+
+If installed via Python's PIP
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Remove deprecated requirements::
+
+    $ curl https://gitlab.com/mayan-edms/mayan-edms/raw/master/removals.txt | pip uninstall -r /dev/stdin
+
+Type in the console::
+
+    $ pip install mayan-edms==3.1.5
+
+the requirements will also be updated automatically.
+
+
+Using Git
+~~~~~~~~~
+
+If you installed Mayan EDMS by cloning the Git repository issue the commands::
+
+    $ git reset --hard HEAD
+    $ git pull
+
+otherwise download the compressed archived and uncompress it overriding the
+existing installation.
+
+Remove deprecated requirements::
+
+    $ pip uninstall -y -r removals.txt
+
+Next upgrade/add the new requirements::
+
+    $ pip install --upgrade -r requirements.txt
+
+
+Common steps
+~~~~~~~~~~~~
+Perform these steps after updating the code from either step above.
+
+Migrate existing database schema with::
+
+    $ mayan-edms.py performupgrade
+
+Add new static media::
+
+    $ mayan-edms.py collectstatic --noinput
+
+The upgrade procedure is now complete.
+
+
+Backward incompatible changes
+-----------------------------
+
+* None
+
+Bugs fixed or issues closed
+===========================
+
+* `GitLab issue #518 <https://gitlab.com/mayan-edms/mayan-edms/issues/518>`_ mountindex broken (3.1.x)
+* `GitLab issue #520 <https://gitlab.com/mayan-edms/mayan-edms/issues/520>`_ Newline handling in template expression for index when mounting the index
+
+.. _PyPI: https://pypi.python.org/pypi/mayan-edms/
diff --git a/mayan/__init__.py b/mayan/__init__.py
index 630b6bc529..4dd44a9fa0 100644
--- a/mayan/__init__.py
+++ b/mayan/__init__.py
@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
 __title__ = 'Mayan EDMS'
-__version__ = '3.1.5'
-__build__ = 0x030105
-__build_string__ = 'v3.1.5_Mon Oct 8 19:51:17 2018 -0400'
+__version__ = '3.1.6'
+__build__ = 0x030106
+__build_string__ = 'v3.1.5-6-gcc2723376_Tue Oct 9 19:15:09 2018 -0400'
 __author__ = 'Roberto Rosario'
 __author_email__ = 'roberto.rosario@mayan-edms.com'
 __description__ = 'Free Open Source Electronic Document Management System'