diff --git a/HISTORY.rst b/HISTORY.rst
index 76f03726e9..aebbb8f1ce 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,4 +1,4 @@
-3.1.2 (2018-09-XX)
+3.1.2 (2018-09-21)
 ==================
 * Database access in data migrations defaults to the 'default' database. Force it to the user selected database instead.
 * Don't use a hardcoded database alias for the destination of the database conversion.
diff --git a/docker/version b/docker/version
index 94ff29cc4d..ef538c2810 100755
--- a/docker/version
+++ b/docker/version
@@ -1 +1 @@
-3.1.1
+3.1.2
diff --git a/docs/releases/3.1.2.rst b/docs/releases/3.1.2.rst
new file mode 100644
index 0000000000..e881735e10
--- /dev/null
+++ b/docs/releases/3.1.2.rst
@@ -0,0 +1,96 @@
+===============================
+Mayan EDMS v3.1.2 release notes
+===============================
+
+Released: September 21, 2018
+
+- Database access in data migrations defaults to the 'default' database.
+  Force it to the user selected database instead.
+- Don't use a hardcoded database alias for the destination of the
+  database conversion.
+- Improve natural key support in the UserOptions model.
+- Update from Django 1.11.11 to 1.11.16.
+- Add support to the convertdb command to operate on specified apps
+  too.
+- Add test mixin to test the db conversion (dumping and loading) of a
+  specific app.
+- Add an user test mixin to group user testing.
+- Add test the user managament app for database conversion.
+- Add support for natural keys to the DocumentPageImageCache model.
+- Add database conversion test to the common app.
+- Fix label display for resolved smart links when not using a dynamic
+  label.
+- Only show smart link resolution errors to the user with the smart link
+  edit permission.
+- Intercept document list view exception and display them as an error
+  message.
+
+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.2
+
+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
+===========================
+
+* None
+
+.. _PyPI: https://pypi.python.org/pypi/mayan-edms/
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index 0ddb696d34..cf2646192d 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -22,6 +22,7 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
    :maxdepth: 1
 
+   3.1.2
    3.1.1
    3.1
    3.0.3
diff --git a/mayan/__init__.py b/mayan/__init__.py
index 58a61b2a3a..c2eb6c0e4c 100644
--- a/mayan/__init__.py
+++ b/mayan/__init__.py
@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
 __title__ = 'Mayan EDMS'
-__version__ = '3.1.1'
+__version__ = '3.1.2'
 __build__ = 0x030101
-__build_string__ = 'v3.1.1_Tue Sep 18 22:10:17 2018 -0400'
+__build_string__ = 'v3.1.1-17-g98c44df9c_Fri Sep 21 02:39:59 2018 -0400'
 __author__ = 'Roberto Rosario'
 __author_email__ = 'roberto.rosario@mayan-edms.com'
 __description__ = 'Free Open Source Electronic Document Management System'
diff --git a/setup.py b/setup.py
index 9956c44be0..95588c022e 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ def find_packages(directory):
     return packages
 
 install_requires = """
-Django==1.11.11
+Django==1.11.16
 Pillow==5.2.0
 PyYAML==3.13
 celery==3.1.24