diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 3c4d2e135..69cb803f5 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,18 +1,19 @@
+django>=1.11,<2.0
+django-haystack==2.8.1
+django-bootstrap3==11.0.0
+django-filter==2.0.0
+djangorestframework==3.9.0
+
 dj-database-url==0.4.1
-django-haystack==2.6.0
-django>=1.10,<1.11
-django-bootstrap3==7.0.1
 django-bower==5.2.0
 django-braces==1.9.0
 django-compressor==2.0
 django-crispy-forms==1.6.1
 django-extensions==1.9.8
 django-extra-views==0.11.0
-django-filter==1.0.0
 django-floppyforms==1.6.2
 django-model-utils==3.1.1
 django-sass-processor==0.5.8
-djangorestframework==3.4.0
 easy-thumbnails==2.5
 django-image-cropping==1.2
 libsass==0.11.1
@@ -32,6 +33,6 @@ whoosh==2.7.4
 django-speedinfo==1.3.5
 django-reversion-compare==0.8.4
 
-git+git://github.com/interlegis/trml2pdf.git
-git+git://github.com/jasperlittle/django-rest-framework-docs
-git+git://github.com/rubgombar1/django-admin-bootstrapped.git
\ No newline at end of file
+#git+git://github.com/interlegis/trml2pdf.git
+#git+git://github.com/jasperlittle/django-rest-framework-docs
+#git+git://github.com/rubgombar1/django-admin-bootstrapped.git
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 61de04956..a64217d42 100644
--- a/setup.py
+++ b/setup.py
@@ -9,21 +9,22 @@ with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme:
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 install_requires = [
+    'django>=1.11,<2.0',
+    'django-haystack==2.8.1',
+    'django-bootstrap3==11.0.0',
+    'django-filter==2.0.0',
+    'djangorestframework==3.9.0',
+
     'dj-database-url==0.4.1',
-    'django-haystack==2.6.0',
-    'django>=1.10,<1.11',
-    'django-bootstrap3==7.0.1',
     'django-bower==5.2.0',
     'django-braces==1.9.0',
     'django-compressor==2.0',
     'django-crispy-forms==1.6.1',
     'django-extensions==1.9.8',
     'django-extra-views==0.11.0',
-    'django-filter==0.15.3',
     'django-floppyforms==1.6.2',
     'django-model-utils==3.1.1',
     'django-sass-processor==0.5.8',
-    'djangorestframework==3.4.0',
     'drfdocs',
     'easy-thumbnails==2.5',
     'django-image-cropping==1.1.0',