diff --git a/.gitignore b/.gitignore
index df46be5fd25349de6d244b7faf9795770cf1b7a8..a0423952f5089a8b5ef2861651506c1ac7d37233 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@
 /extension/Resources/Public/Css
 /doc/jsdoc
 /dist/
+.python_virtualenv/
+.virtual_env
diff --git a/Makefile b/Makefile
index bedc3ec3a3486328dc43e1076e89edfbad9d4fa9..672c01218e80a217e4ab6c1da29d8adc8405f060 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,21 @@
 PHPDOC ?= support/pear/phpdoc
 JSDOC ?= jsdoc
+
 PKG_VERSION = $(shell awk '/version/ { print $$3 }' extension/ext_emconf.php  | sed "s/'//g")
+
 NIGHTLY_DATE = $(shell date '+%Y%m%d')
 RELEASE_DATE = $(shell date '+%Y%m%d%H%M')
+
 GIT_REVISION_SHORT = $(shell git rev-parse --short HEAD || true)
 GIT_REVISION_LONG = $(shell git rev-parse HEAD || true)
+
 EXTENSION_CONTENT = Classes Configuration Documentation qfq Resources ext_emconf.php ext_localconf.php ext_tables.php ext_icon.png config.qfq.example.ini RELEASE.txt
+
 DISTDIR=dist
 
+# Use by jenkins to separate temp directories used by pip in order to allow concurrent builds
+PIP_TMP ?= /tmp
+
 all: archive t3sphinx
 
 doc: phpdoc jsdoc plantuml
@@ -110,9 +118,12 @@ phpdoc: .phpdocinstall
 	mkdir -p doc/plantuml/php
 	touch $@
 
-.virtual_env:
+.virtual_env: pip-temp-directory
 	virtualenv .python_virtualenv
-	. .python_virtualenv/bin/activate ; pip install --upgrade sphinx==1.5.5
+	. .python_virtualenv/bin/activate ; TMPDIR="$(PIP_TMP)" pip install --upgrade sphinx==1.5.5
 	touch $@
 
-.PHONY: nightly maintainer-clean snapshot release git-revision t3sphinx build-dist make-dist-dir dist-move-doc dist-copy-extension
+pip-temp-directory:
+	test -d "$(PIP_TMP)" || mkdir -p "$(PIP_TMP)"
+
+.PHONY: nightly maintainer-clean snapshot release git-revision t3sphinx build-dist make-dist-dir dist-move-doc dist-copy-extension pip-temp-directory