diff --git a/HISTORY.rst b/HISTORY.rst
index e6785dd476..540ac20a12 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,7 @@
 - Update Pillow to 3.1.2 (Security fix).
 - Backport zoom transformation performance improvement (GitLab #334).
 - Backport trash can navigation link resolution fix (GitLab #331).
+- Improve documentation regarding the use of GPG version 1 (GitLab #333).
 
 2.1.4 (2016-10-28)
 ==================
diff --git a/docs/index.rst b/docs/index.rst
index 5414dd9a4b..3038bca246 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -10,7 +10,9 @@ and install it from PyPI with the following commands:
 
 .. code-block:: bash
 
-    $ sudo apt-get install libjpeg-dev libmagic1 libpng-dev libreoffice libtiff-dev gcc ghostscript gnupg1 python-dev python-virtualenv tesseract-ocr poppler-utils -y
+    $ sudo apt-get install libjpeg-dev libmagic1 libpng-dev \
+    libreoffice libtiff-dev gcc ghostscript gnupg python-dev \
+    python-virtualenv tesseract-ocr poppler-utils -y
     $ virtualenv venv
     $ source venv/bin/activate
     (venv) pip install mayan-edms
diff --git a/docs/releases/2.1.5.rst b/docs/releases/2.1.5.rst
index 474d7f76b6..4a75e8fd18 100644
--- a/docs/releases/2.1.5.rst
+++ b/docs/releases/2.1.5.rst
@@ -20,7 +20,7 @@ Other changes
 
 - Backport zoom performance improvement (GitLab #334).
 - Backport trash can navigation link resolution fix (GitLab #331).
-
+- Improve documentation regarding the use of GPG version 1 (GitLab #333).
 
 Removals
 --------
@@ -77,6 +77,7 @@ Bugs fixed or issues closed
 
 * `GitLab issue #319 <https://gitlab.com/mayan-edms/mayan-edms/issues/319>`_ TransformationResize issue with very "long" image
 * `GitLab issue #331 <https://gitlab.com/mayan-edms/mayan-edms/issues/331>`_ Trash List View: Items actions should be limited
+* `GitLab issue #333 <https://gitlab.com/mayan-edms/mayan-edms/issues/333>`_ "Unable to run gpg - it may not be available."
 * `GitLab issue #334 <https://gitlab.com/mayan-edms/mayan-edms/issues/334>`_ Perfomance improvment: prevent unnecessary image.resize in TransformationZoom
 
 .. _PyPI: https://pypi.python.org/pypi/mayan-edms/
diff --git a/docs/topics/deploying.rst b/docs/topics/deploying.rst
index 4893a9bd20..227998700e 100644
--- a/docs/topics/deploying.rst
+++ b/docs/topics/deploying.rst
@@ -22,9 +22,13 @@ Install all system dependencies::
 
     apt-get install nginx supervisor redis-server postgresql \
     libpq-dev libjpeg-dev libmagic1 libpng-dev libreoffice \
-    libtiff-dev gcc ghostscript gnupg1 python-dev python-virtualenv \
+    libtiff-dev gcc ghostscript gnupg python-dev python-virtualenv \
     tesseract-ocr poppler-utils -y
 
+If using Ubuntu 16.10 also install GPG version 1 (as GPG version 2 is the new default for this distribution and not yet supported by Mayan EDMS) ::
+
+    apt-get install gnupg1 -y
+
 Change to the directory where the project will be deployed::
 
     cd /usr/share
@@ -81,6 +85,9 @@ Append the following to the ``mayan/settings/local.py`` file, paying attention t
 
     BROKER_URL = 'redis://127.0.0.1:6379/0'
     CELERY_RESULT_BACKEND = 'redis://127.0.0.1:6379/0'
+
+If using Ubuntu 16.10, also add this line to the ``mayan/settings/local.py`` file::
+
     SIGNATURES_GPG_PATH = '/usr/bin/gpg1'
 
 Migrate the database or initialize the project::
diff --git a/mayan/settings/testing/base.py b/mayan/settings/testing/base.py
index ab85238029..20e0329014 100644
--- a/mayan/settings/testing/base.py
+++ b/mayan/settings/testing/base.py
@@ -2,8 +2,6 @@ from __future__ import absolute_import, unicode_literals
 
 from ..base import *  # NOQA
 
-SIGNATURES_GPG_PATH = '/usr/bin/gpg1'
-
 INSTALLED_APPS += ('test_without_migrations',)
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
diff --git a/mayan/settings/testing/gitlab-ci/__init__.py b/mayan/settings/testing/gitlab-ci/__init__.py
index 5064039dd7..52dd3067e9 100644
--- a/mayan/settings/testing/gitlab-ci/__init__.py
+++ b/mayan/settings/testing/gitlab-ci/__init__.py
@@ -1 +1,4 @@
 from ..base import *  # NOQA
+
+SIGNATURES_GPG_PATH = '/usr/bin/gpg1'
+