diff --git a/openbis_all/source/bash/build/branch.sh b/openbis_all/source/bash/build/branch.sh
index 073c4280ab2436ad942b4ba3ad99c2bb525ef85c..b51286a1dd28aba2cbcd25d4b462a19104dbb2b5 100755
--- a/openbis_all/source/bash/build/branch.sh
+++ b/openbis_all/source/bash/build/branch.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-if [ `dirname $0` != "." ]
-then
-	echo "Please run from the same directory than the script source file is in"
-	exit 1
-fi
 
 if [ $# -ne 1 ]
 then
@@ -50,23 +45,23 @@ screening \
 ui-test\
 "
 
-rm -rf out
+rm -rf tmp
 
 svn mkdir --parents svn+ssh://svncisd.ethz.ch/repos/cisd/openbis_all/branches/$1 -m "create branch $1";
-svn co svn+ssh://svncisd.ethz.ch/repos/cisd/openbis_all/branches/$1 out
+svn co svn+ssh://svncisd.ethz.ch/repos/cisd/openbis_all/branches/$1 tmp
 
 for project in $ALL_PROJECTS; do
-	svn copy svn+ssh://svncisd.ethz.ch/repos/cisd/$project/trunk out/$project
+	svn copy svn+ssh://svncisd.ethz.ch/repos/cisd/$project/trunk tmp/$project
 done
 
-cd out
+cd tmp
 svn commit -m "create branch $1"
 cd ..
 
-rm -rf out
-mkdir -p out
+rm -rf tmp
+mkdir -p tmp
 
-svn checkout --depth=immediates svn+ssh://svncisd.ethz.ch/repos/cisd/openbis_all/branches/$1 out;
+svn checkout --depth=immediates svn+ssh://svncisd.ethz.ch/repos/cisd/openbis_all/branches/$1 tmp;
 
 GRADLE_PROJECTS="\
 gradle \
@@ -91,13 +86,13 @@ ui-test\
 "
 
 for project in $GRADLE_PROJECTS; do
-	cd out/$project;
+	cd tmp/$project;
 	svn update gradlew gradle build.gradle settings.gradle javaproject.gradle repository.gradle gwtdev.gradle query-api.gradle proteomics-api.gradle screening-api.gradle admin-console.gradle clients.gradle;
 	cd ../..;
 done
 
 for project in $GRADLE_PROJECTS; do
-	cd out/$project;
+	cd tmp/$project;
 	./gradlew dependencyReport;
 	cat targets/gradle/reports/project/dependencies.txt|egrep ^.---|grep \>|sort|uniq|awk '{print $2 ":" $4}'|awk -F: '{print "s/" $1 ":" $2 ":" $3 "/" $1 ":" $2 ":" $4 "/g"}' > sed_commands;
 	
@@ -112,6 +107,6 @@ for project in $GRADLE_PROJECTS; do
 	cd ../..;
 done
 
-cd out
+cd tmp
 svn commit -m "fixed dependencies of $1";
 cd ..
diff --git a/openbis_all/source/bash/build/build.sh b/openbis_all/source/bash/build/build.sh
index 1b8537842901878fe3d925d7161012dd6dfb739f..e8857883a636ce7dc99561e794553be11727ffee 100755
--- a/openbis_all/source/bash/build/build.sh
+++ b/openbis_all/source/bash/build/build.sh
@@ -13,17 +13,17 @@ then
 	usage
 fi
 
-rm -rf out
-mkdir -p out
-svn checkout svn+ssh://svncisd.ethz.ch/repos/cisd/openbis_all/tags/$1/$2 out;
+rm -rf tmp
+mkdir -p tmp
+svn checkout svn+ssh://svncisd.ethz.ch/repos/cisd/openbis_all/tags/$1/$2 tmp;
 if [ $? -ne 0 ]
 then
 	exit
 fi
 
-cd out/gradle
+cd tmp/gradle
 ./gradlew :openbis_standard_technologies:clientsAndApis
 ./gradlew :installation:build
 cd ../..
-mv out/openbis_standard_technologies/targets/gradle/distributions/openBIS-clients-and-APIs*.zip .
-mv out/installation/targets/gradle/distributions/openBIS-installation-standard-technologies*.tar.gz .
+mv tmp/openbis_standard_technologies/targets/gradle/distributions/openBIS-clients-and-APIs*.zip .
+mv tmp/installation/targets/gradle/distributions/openBIS-installation-standard-technologies*.tar.gz .
diff --git a/openbis_all/source/bash/build/tag.sh b/openbis_all/source/bash/build/tag.sh
index 5b17331bf04eb988c605aacd7d0ab14c8e960dcb..8fb4e9c361392f1c5e9408b676fe1bab8373c7bf 100755
--- a/openbis_all/source/bash/build/tag.sh
+++ b/openbis_all/source/bash/build/tag.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-if [ `dirname $0` != "." ]
-then
-	echo "Please run from the same directory than the script source file is in"
-	exit 1
-fi
 
 if [ $# -ne 2 ]
 then
diff --git a/openbis_all/source/bash/svn-update.sh b/openbis_all/source/bash/svn-update.sh
index e01438547d97f52ac2e9b94aef87809572fe2d33..1bbeaebf1456a5db0bb3a83d91ed91dc406a2694 100755
--- a/openbis_all/source/bash/svn-update.sh
+++ b/openbis_all/source/bash/svn-update.sh
@@ -7,5 +7,6 @@ cd ~openbis/bin
 wget -nv -r -l2 -A.{sh,txt} http://$SVN/
 mv $SVN/* .
 chmod 700 *.sh
+chmod 700 build/*.sh
 RM=`echo $SVN | cut -d / -f1`
 rm -rf $RM
diff --git a/openbis_all/source/bash/build/tag_and_build_sprint.sh b/openbis_all/source/bash/tag_and_build_sprint.sh
similarity index 77%
rename from openbis_all/source/bash/build/tag_and_build_sprint.sh
rename to openbis_all/source/bash/tag_and_build_sprint.sh
index e96c5c8cd538d123396f1a56992acb4fdddd9f40..05219a84d79449b29030518e3299d75744e2e686 100755
--- a/openbis_all/source/bash/build/tag_and_build_sprint.sh
+++ b/openbis_all/source/bash/tag_and_build_sprint.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+BIN_DIR=`dirname "$0"`
 
 usage()
 {
@@ -36,11 +37,11 @@ fi
 
 if [ ${HOT_FIX_NUMBER} -eq 0 ]
 then
-	./branch.sh sprint/S${1}.x
+	"$BIN_DIR/build/branch.sh" sprint/S${1}.x
 	if [ $? -ne 0 ];then exit 1; fi	
 fi
 
-./tag.sh sprint/S${1}.x S${1}.${HOT_FIX_NUMBER}
+"$BIN_DIR/build/tag.sh" sprint/S${1}.x S${1}.${HOT_FIX_NUMBER}
 if [ $? -ne 0 ];then exit 1; fi	
 
-./build.sh sprint S${1}.x/S${1}.${HOT_FIX_NUMBER}
\ No newline at end of file
+""$BIN_DIR/build/build.sh" sprint S${1}.x/S${1}.${HOT_FIX_NUMBER}
\ No newline at end of file