diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index 61e4851c..394d924c 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -37,7 +37,7 @@ ifeq ($(GIT_SSH),)
   export GIT_SSH := $(CVS_RSH)
 endif
 
-export JW_BUILD_SSH_EXTRA_OPTS = -o ControlMaster=auto -o ControlPath=./%r@build:%p -o ControlPersist=60s
+export JW_BUILD_SSH_EXTRA_OPTS = -o ControlMaster=auto -o ControlPath=/tmp/%r@build:%p -o ControlPersist=3m
 
 ifneq ($(CLONE_FROM_USER),)
   export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER)
@@ -60,6 +60,7 @@ PKG_MANAGER_SH       ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-m
 BROWSER              ?= firefox
 GIT_SRV_ADMIN         = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh 
 CVS_ADMIN             = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/cvs-admin.sh 
+
 # ------------ targets
   
 all: pull.done
diff --git a/scripts/purge-stale-projects.sh b/scripts/purge-stale-projects.sh
index ae2dac3d..016a6310 100644
--- a/scripts/purge-stale-projects.sh
+++ b/scripts/purge-stale-projects.sh
@@ -41,10 +41,15 @@ check_scm()
 	fi
 }
 
+ssh=ssh
+[ "$CVS_RSH" ] && ssh="$CVS_RSH"
+[ "$GIT_SSH" ] && ssh="$GIT_SSH"
+[ "$JANWARE_USER" ] || JANWARE_USER=`whoami`
+ssh="$ssh -l $JANWARE_USER"
 local_cvs_proj=`ls -d */CVS 2>/dev/null | sed 's%/[^/]*%%'`
 local_git_proj=`ls -d */.git 2>/dev/null | sed 's%/[^/]*%%'`
-remote_cvs_proj=`ssh cvs.jannet.de find /home/jannet/arc/cvs/proj -maxdepth 1 -mindepth 1 -type d -executable -readable | sed 's%.*/%%'`
-remote_git_proj=`ssh git.jannet.de git-srv-admin.sh -j list-personal-projects`
+remote_cvs_proj=`$ssh cvs.jannet.de find /home/jannet/arc/cvs/proj -maxdepth 1 -mindepth 1 -type d -executable -readable | sed 's%.*/%%'`
+remote_git_proj=`$ssh git.jannet.de git-srv-admin.sh -j list-personal-projects`
 
 date=`date +'%Y%m%d'`
 myname=`basename $0`