diff --git a/HISTORY.rst b/HISTORY.rst
index 98847eaca6..4fa0ba0b7a 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,7 @@
 2.1.5 (2016-xx-xx)
 ==================
 - Backport resize transformation math operation fix (GitLab #319).
+- Update Pillow to 3.1.2 (Security fix).
 
 2.1.4 (2016-10-28)
 ==================
diff --git a/docs/releases/2.1.5.rst b/docs/releases/2.1.5.rst
new file mode 100644
index 0000000000..a8448d1365
--- /dev/null
+++ b/docs/releases/2.1.5.rst
@@ -0,0 +1,75 @@
+===============================
+Mayan EDMS v2.1.5 release notes
+===============================
+
+Released: XX, 2016
+
+What's new
+==========
+
+This is a bug-fix release and all users are encouraged to upgrade.
+
+Other changes
+-------------
+
+- Update Pillow to 3.1.2
+
+    - https://pillow.readthedocs.io/en/3.4.x/releasenotes/3.1.1.html
+    - https://pillow.readthedocs.io/en/3.4.x/releasenotes/3.1.2.html
+
+Removals
+--------
+* None
+
+Upgrading from a previous version
+---------------------------------
+
+Using PIP
+~~~~~~~~~
+
+Type in the console::
+
+    $ pip install -U mayan-edms
+
+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.
+
+Next upgrade/add the new requirements::
+
+    $ pip install --upgrade -r requirements.txt
+
+Common steps
+~~~~~~~~~~~~
+
+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 #311 <https://gitlab.com/mayan-edms/mayan-edms/issues/311>`_ acl page return ContentType:Document
+
+.. _PyPI: https://pypi.python.org/pypi/mayan-edms/
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index eb7c8bee1e..7e0b85a652 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
 
+   2.1.5
    2.1.4
    2.1.3
    2.1.2
diff --git a/requirements/base.txt b/requirements/base.txt
index 529260ad08..c87051054e 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,4 +1,4 @@
-Pillow==3.1.0
+Pillow==3.1.2
 PyYAML==3.11
 
 celery==3.1.19
diff --git a/setup.py b/setup.py
index 9a7462d238..b2396e91eb 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ def find_packages(directory):
 
 install_requires = """
 Django==1.8.15
-Pillow==3.1.0
+Pillow==3.1.2
 PyYAML==3.11
 celery==3.1.19
 cssmin==0.2.0