diff --git a/HISTORY.rst b/HISTORY.rst
index 28ddb00811..2dee2a7851 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -269,6 +269,8 @@
   COMMON_PROJECT_URL + document URL instead of the Site
   domain.
 * Add the checkdependencies command.
+* Add comment and make file target to generate all requirement
+  files.
 
 3.1.11 (2019-04-XX)
 ===================
diff --git a/Makefile b/Makefile
index 80096f8c3d..bffe667715 100644
--- a/Makefile
+++ b/Makefile
@@ -115,11 +115,6 @@ translations-push: ## Upload all translation files to Transifex.
 translations-pull: ## Download all translation files from Transifex.
 	tx pull -f
 
-
-generate-setup: ## Create and update the setup.py file.
-	@./generate_setup.py
-	@echo "Complete."
-
 # Releases
 
 increase-version: ## Increase the version number of the entire project's files.
@@ -224,6 +219,18 @@ python-wheel-test-suit: wheel
 	_virtualenv/bin/mayan-edms.py test --mayan-apps \
 	'
 
+generate-setup: ## Create and update the setup.py file.
+generate-setup: generate-requirements
+	@./generate_setup.py
+	@echo "Complete."
+
+generate-requirements: ## Generate all requirements files from the project depedency declarations.
+	@./manage.py generaterequirements build > requirements/build.txt
+	@./manage.py generaterequirements development > requirements/development.txt
+	@./manage.py generaterequirements testing > requirements/testing-base.txt
+	@./manage.py generaterequirements production --exclude=django > requirements/base.txt
+	@./manage.py generaterequirements production --only=django > requirements/common.txt
+
 # Dev server
 
 runserver: ## Run the development server.
@@ -300,7 +307,7 @@ check-readme: ## Checks validity of the README.rst file for PyPI publication.
 check-missing-migrations: ## Make sure all models have proper migrations.
 	./manage.py makemigrations --dry-run --noinput --check
 
-setup-dev-environment:
+setup-dev-environment: ## Bootstrap a virtualenv by install all dependencies to start developing.
 	pip install -r requirements.txt -r requirements/development.txt -r requirements/testing-base.txt -r requirements/documentation.txt -r requirements/build.txt
 
 -include docker/Makefile
diff --git a/docs/releases/3.2.rst b/docs/releases/3.2.rst
index 00dabce915..4eeac97c7b 100644
--- a/docs/releases/3.2.rst
+++ b/docs/releases/3.2.rst
@@ -579,6 +579,8 @@ Other changes
   COMMON_PROJECT_URL + document URL instead of the Site
   domain.
 * Add the checkdependencies command.
+* Add comment and make file target to generate all requirement
+  files.
 
 
 Removals
diff --git a/requirements.txt b/requirements.txt
index c58f7cb09c..3666b3aa41 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
 -r requirements/common.txt
+-r requirements/base.txt