diff --git a/devel/upload.in b/devel/upload.in
index 733befa338d9e9d7c50a9340297fbeab602cb942..0ba650b8dd5a20af97976b5327d2222386dbe8af 100644
--- a/devel/upload.in
+++ b/devel/upload.in
@@ -63,8 +63,15 @@ set ${hosts}
 TXD=`mktemp -d`
 trap 'rm -rf $TXD' EXIT
 
+if [[ -f /proc/cpuinfo ]]; then
+  cpu_count=$(grep -E -c '^processor\s*:' /proc/cpuinfo)
+  make_args=-j$(( cpu_count + 1 ))
+else
+  make_args=
+fi
+
 # install ganeti as a real tree
-make install DESTDIR="$TXD"
+make $make_args install DESTDIR="$TXD"
 
 # copy additional needed files
 install -D --mode=0755 doc/examples/ganeti.initd \