diff --git a/Makefile b/Makefile
index 61c54e4..2209406 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,22 @@ CMD_PIP_COMPILE ?= pip-compile --rebuild --upgrade $(CMD_PIP_COMPILE_OPTS)
 
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
-	$(CMD_PIP_COMPILE) -o requirements/scripts.txt requirements/scripts.in
+	pip install -qr requirements/pip-tools.txt
+	# Make sure to compile files after any other files they include!
+	$(CMD_PIP_COMPILE) --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
+	$(CMD_PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in
+	pip install -qr requirements/pip.txt
+	pip install -qr requirements/pip-tools.txt
+	$(CMD_PIP_COMPILE) -o requirements/base.txt requirements/base.in
+	$(CMD_PIP_COMPILE) -o requirements/test.txt requirements/test.in
+	$(CMD_PIP_COMPILE) -o requirements/doc.txt requirements/doc.in
+	$(CMD_PIP_COMPILE) -o requirements/quality.txt requirements/quality.in
+	$(CMD_PIP_COMPILE) -o requirements/ci.txt requirements/ci.in
+	$(CMD_PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
+	# Let tox control the Django version for tests
+	sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
+	mv requirements/test.tmp requirements/test.txt
+
 
 upgrade_package: ## update the requirements/*.txt file with the latest version of $package
 	@test -n "$(package)" || { echo "\nUsage: make upgrade_package package=...\n"; exit 1; }