diff --git a/openbis_all/source/bash/build.sh b/openbis_all/source/bash/build.sh
index 610604b4c74c9019ce47aab188aa92ad1eca17ae..0503f83c5f167c581411ff798e676a4b365e731d 100755
--- a/openbis_all/source/bash/build.sh
+++ b/openbis_all/source/bash/build.sh
@@ -73,32 +73,23 @@ function copy_to_cisd_server {
 	state_end
 }
 
-function copy_to_sprint_server {
-	state_start "Copying new openBIS components to '$SPRINT_SERVER'..."
-	
-	if [ $EXECUTE_COMMANDS ]; then
-		scp openBIS-server-S*.zip $SPRINT_SERVER:.
-		scp datastore_server-S*.zip $SPRINT_SERVER:.
-		scp *.zip $SPRINT_SERVER:~/sprint_builds
-		rm -f *.zip
-	fi
-	state_end
-}
-
-
 function publish_javadocs {
 
 	state_start "Publishing javadocs ..."
 	
 	if [ $EXECUTE_COMMANDS ]; then
-	    pushd .
-	    
-	    cp -R tmp/openbis_all/targets/dist/javadoc $JAVADOC_FOLDER/$FULL_VER
-	    cd $JAVADOC_FOLDER
-	    rm -f current
-	    ln -s $FULL_VER current
+	    local javadocSrcDir=tmp/openbis_all/targets/dist/javadoc
 	    
-	    popd
+	    if [ -d "$javadocSrcDir" ]; then
+			    pushd .
+			    
+			    cp -R $javadocSrcDir $JAVADOC_FOLDER/$FULL_VER
+			    cd $JAVADOC_FOLDER
+			    rm -f current
+			    ln -s $FULL_VER current
+			    
+			    popd
+			fi
 	fi
 	state_end
 }
@@ -124,7 +115,6 @@ fi
 setup
 build
 copy_to_cisd_server
-copy_to_sprint_server
 publish_javadocs
 install_sprint
 
diff --git a/openbis_all/source/bash/tag_and_build.sh b/openbis_all/source/bash/tag_and_build.sh
index 726922297d643250dcd3c3be681289370854b9c6..27130b1724748f6a659a76fa01cfee4a18f613e6 100755
--- a/openbis_all/source/bash/tag_and_build.sh
+++ b/openbis_all/source/bash/tag_and_build.sh
@@ -74,26 +74,15 @@ function build {
 }
 
 function copy_to_cisd_server {
-	state_start "Copying new openBIS components to '$CISD_SERVER'..."
+	state_start "Copying new openBIS components to sprint-builds'..."
 	
 	if [ $EXECUTE_COMMANDS ]; then
-		OPENBIS_PATH=cisd/sprint_builds/openBIS
+	  
+		OPENBIS_PATH=~openbis/fileserver/sprint_builds/openBIS
 		SPRINT_DIR=$OPENBIS_PATH/$TODAY-$FULL_VER
-		echo "mkdir -p $SPRINT_DIR"  | ssh -T $CISD_SERVER
-		scp *.zip $CISD_SERVER:$SPRINT_DIR
-		echo "chmod g+w -R $SPRINT_DIR" | ssh -T $CISD_SERVER
-	fi
-	state_end
-}
-
-function copy_to_sprint_server {
-	state_start "Copying new openBIS components to '$SPRINT_SERVER'..."
-	
-	if [ $EXECUTE_COMMANDS ]; then
-		scp openBIS-server-S*.zip $SPRINT_SERVER:.
-		scp datastore_server-S*.zip $SPRINT_SERVER:.
-		scp *.zip $SPRINT_SERVER:~/sprint_builds
-		rm -f *.zip
+		mkdir -p $SPRINT_DIR
+		cp -p *.zip $SPRINT_DIR/
+		chmod g+w -R $SPRINT_DIR
 	fi
 	state_end
 }
@@ -103,14 +92,18 @@ function publish_javadocs {
 	state_start "Publishing javadocs ..."
 	
 	if [ $EXECUTE_COMMANDS ]; then
-	    pushd .
-	    
-	    cp -R tmp/openbis_all/targets/dist/javadoc $JAVADOC_FOLDER/$FULL_VER
-	    cd $JAVADOC_FOLDER
-	    rm -f current
-	    ln -s $FULL_VER current
+	    local javadocSrcDir=tmp/openbis_all/targets/dist/javadoc
 	    
-	    popd
+	    if [ -d "$javadocSrcDir" ]; then
+			    pushd .
+			    
+			    cp -R $javadocSrcDir $JAVADOC_FOLDER/$FULL_VER
+			    cd $JAVADOC_FOLDER
+			    rm -f current
+			    ln -s $FULL_VER current
+			    
+			    popd
+			fi
 	fi
 	state_end
 }
@@ -138,7 +131,6 @@ setup
 tag
 build
 copy_to_cisd_server
-copy_to_sprint_server
 publish_javadocs
 install_sprint