diff --git a/mayan/__init__.py b/mayan/__init__.py
index 6008dbd041..8fdd40b4fa 100644
--- a/mayan/__init__.py
+++ b/mayan/__init__.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 __title__ = 'Mayan EDMS'
 __version__ = '3.2b1'
 __build__ = 0x030200
-__build_string__ = 'v3.1.10-351-g72cdfe58c5_Thu May 9 20:30:48 2019 +0000'
+__build_string__ = 'v3.1.10-425-g8e32c5adae_Wed May 15 15:58:54 2019 -0400'
 __django_version__ = '1.11'
 __author__ = 'Roberto Rosario'
 __author_email__ = 'roberto.rosario@mayan-edms.com'
diff --git a/requirements/base.txt b/requirements/base.txt
index 9534300c22..1ae7376c00 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,8 +1,7 @@
 Pillow==6.0.0
+PyPDF2==1.26.0
 PyYAML==5.1
-
 celery==3.1.24
-
 django-activity-stream==0.7.0
 django-celery==3.2.1
 django-colorful==1.3
@@ -10,10 +9,10 @@ django-cors-headers==2.5.2
 django-downloadview==1.9
 django-environ==0.4.5
 django-formtools==2.1
-django-pure-pagination==0.3.0
 django-mathfilters==0.4.0
 django-model-utils==3.1.2
 django-mptt==0.9.1
+django-pure-pagination==0.3.0
 django-qsstats-magic==1.0.0
 django-solo==1.1.3
 django-stronghold==0.3.0
@@ -21,32 +20,23 @@ django-widget-tweaks==1.4.3
 djangorestframework==3.7.7
 djangorestframework-recursive==0.1.2
 drf-yasg==1.6.0
-
 flanker==0.9.0
 flex==6.14.0
 furl==2.0.0
 fusepy==3.0.1
-
 gevent==1.4.0
 graphviz==0.10.1
 gunicorn==19.9.0
-
 mock==2.0.0
-
 node-semver==0.6.1
-
 pathlib2==2.3.3
 pycountry==18.12.8
-PyPDF2==1.26.0
 pyocr==0.6
 python-dateutil==2.8.0
-python-gnupg==0.3.9
 python-magic==0.4.15
+python_gnupg==0.3.9
 pytz==2019.1
-
 requests==2.21.0
-
 sh==1.12.14
 swagger-spec-validator==2.4.3
-
 whitenoise==4.1.2
diff --git a/requirements/build.txt b/requirements/build.txt
index 6b1e6c1420..ec2070166d 100644
--- a/requirements/build.txt
+++ b/requirements/build.txt
@@ -1,4 +1,2 @@
-# requirements/build.txt
 twine==1.9.1
-
 wheel==0.30.0
diff --git a/requirements/common.txt b/requirements/common.txt
index 570526c502..86583ad884 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -1,2 +1 @@
-Django==1.11.20
--r base.txt
+django==1.11.20
diff --git a/requirements/development.txt b/requirements/development.txt
index 14f72a1530..ea60187b8d 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -1,19 +1,9 @@
-# requirements/development.txt
 Werkzeug==0.15.2
-
 django-debug-toolbar==1.11
 django-extensions==2.1.6
 django-rosetta==0.9.2
-
 flake8==3.7.7
-
 ipython==5.5.0
-
 readme==0.7.1
-
 safety==1.8.5
-
 transifex-client==0.13.6
-
--r build.txt
--r testing-base.txt
diff --git a/requirements/testing-base.txt b/requirements/testing-base.txt
index 5cc19f15fd..5702dbb1df 100644
--- a/requirements/testing-base.txt
+++ b/requirements/testing-base.txt
@@ -2,5 +2,5 @@ codecov==2.0.15
 coverage==4.4.1
 coveralls==1.3.0
 django-test-without-migrations==0.6
-tox==3.8.6
 psutil==5.6.1
+tox==3.8.6
diff --git a/setup.py b/setup.py
index d9576f8d36..82e884c336 100644
--- a/setup.py
+++ b/setup.py
@@ -56,8 +56,9 @@ def find_packages(directory):
     return packages
 
 install_requires = """
-Django==1.11.20
+django==1.11.20
 Pillow==6.0.0
+PyPDF2==1.26.0
 PyYAML==5.1
 celery==3.1.24
 django-activity-stream==0.7.0
@@ -67,10 +68,10 @@ django-cors-headers==2.5.2
 django-downloadview==1.9
 django-environ==0.4.5
 django-formtools==2.1
-django-pure-pagination==0.3.0
 django-mathfilters==0.4.0
 django-model-utils==3.1.2
 django-mptt==0.9.1
+django-pure-pagination==0.3.0
 django-qsstats-magic==1.0.0
 django-solo==1.1.3
 django-stronghold==0.3.0
@@ -89,11 +90,10 @@ mock==2.0.0
 node-semver==0.6.1
 pathlib2==2.3.3
 pycountry==18.12.8
-PyPDF2==1.26.0
 pyocr==0.6
 python-dateutil==2.8.0
-python-gnupg==0.3.9
 python-magic==0.4.15
+python_gnupg==0.3.9
 pytz==2019.1
 requests==2.21.0
 sh==1.12.14
@@ -121,6 +121,11 @@ setup(
         'Natural Language :: English',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
         'Topic :: Communications :: File Sharing',
@@ -133,6 +138,7 @@ setup(
     name=PACKAGE_NAME,
     packages=find_packages(PACKAGE_DIR),
     platforms=['any'],
+    python_requires = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     scripts=['mayan/bin/mayan-edms.py'],
     url='https://gitlab.com/mayan-edms/mayan-edms',
     version=mayan.__version__,