diff --git a/.gitignore b/.gitignore
index c6ebd3a9d5..6a625abb94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ misc/mayan.geany
 image_cache/
 build/
 _build/
+gpg_home/
diff --git a/apps/django_gpg/conf/settings.py b/apps/django_gpg/conf/settings.py
index 696447b94a..03e5a8d622 100644
--- a/apps/django_gpg/conf/settings.py
+++ b/apps/django_gpg/conf/settings.py
@@ -1,6 +1,6 @@
-'''
+"""
 Configuration options for the django_gpg app
-'''
+"""
 
 from django.utils.translation import ugettext_lazy as _
 
@@ -11,5 +11,6 @@ register_settings(
     module=u'django_gpg.conf.settings',
     settings=[
         {'name': u'KEYSERVERS', 'global_name': u'SIGNATURES_KEYSERVERS', 'default': ['pool.sks-keyservers.net'], 'description': _(u'List of keyservers to be queried for unknown keys.')},
+        {'name': u'GPG_HOME', 'global_name': u'SIGNATURES_GPG_HOME', 'default': 'gpg_home', 'description': _(u'Home directory used to store keys as well as configuration files.')},
     ]
 )
diff --git a/apps/django_gpg/runtime.py b/apps/django_gpg/runtime.py
index b3303059ff..545dc106c7 100644
--- a/apps/django_gpg/runtime.py
+++ b/apps/django_gpg/runtime.py
@@ -1,4 +1,4 @@
 from django_gpg.api import GPG
-from django_gpg.conf.settings import KEYSERVERS
+from django_gpg.conf.settings import KEYSERVERS, GPG_HOME
 
-gpg = GPG(keyservers=KEYSERVERS)
+gpg = GPG(home=GPG_HOME, keyservers=KEYSERVERS)
diff --git a/docs/releases/0.12.rst b/docs/releases/0.12.rst
index f8ccfd25eb..e00b715aa4 100644
--- a/docs/releases/0.12.rst
+++ b/docs/releases/0.12.rst
@@ -80,7 +80,13 @@ The code for downloading single and multiple document and document versions
 has been merged with compression support also added.  This allows for the
 download of documents in their original format or compressed and well as
 the download of several documents in a single compressed file.   
-  
+
+Customizable GPG home directory
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Addition of the SIGNATURES_GPG_HOME configuration option to let 
+administrators set Mayan EDMS's GPG instance home directory, used to
+store keyrings and other GPG configuration files.
+
 Upgrading
 =========
 
diff --git a/docs/settings.rst b/docs/settings.rst
index d39e9ca68a..3b1fc65f25 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -412,3 +412,10 @@ Signatures
     Default: ``['pool.sks-keyservers.net']`` 
     
     List of keyservers to be queried for unknown keys.
+
+
+.. data:: SIGNATURES_GPG_HOME    
+    
+    Default: ``gpg_home``
+    
+    Home directory used to store keys as well as configuration files.