diff --git a/Makefile b/Makefile
index 15a85fb7b4af3bacbcf25d1e3bdac0be8c8db75c..d621f501ff0c283e55df0a8f5468072756405e5c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,22 @@
 SHELL = /bin/bash
 
+numCores=$(shell nproc --all)
+
 DOCMODULES = Sd1 Sda1 Sda2
 
 doc:
-	cd Doc;$(MAKE) -j24 all
+	cd Doc;$(MAKE) -j${numCores} all
 
 all:doc
 	mvn --fail-at-end install 
-	mvn -T 8 --fail-at-end javadoc:javadoc
+	mvn -T ${numCores} --fail-at-end javadoc:javadoc
 	mkdir -p Doc/target/navi/de.hdm_stuttgart.mi.lectures/P
-	cd P;$(MAKE) -j 8 install
+	cd P;$(MAKE) -j ${numCores} install
 	cd P; tar c- ${DOCMODULES} | tar -x -C ../Doc/target/navi/de.hdm_stuttgart.mi.lectures/P
 
 clean:
-	cd Doc;$(MAKE) -j 8 clean
-	mvn -T 8 clean
+	cd Doc;$(MAKE) -j ${numCores} clean
+	mvn -T ${numCores} clean
 
 install:
 	cd Doc/target &&  rsync -av --delete navi nonavi infocenter2@www.mi.hdm-stuttgart.de:doc