diff --git a/openbis/dist/admin/boot.sh b/openbis/dist/admin/boot.sh
index e72bf91b6b29eec97fec8b45544820ef8fce58ef..8ac8e39c7019a57f24b0e25d3c20acd4e93bceda 100755
--- a/openbis/dist/admin/boot.sh
+++ b/openbis/dist/admin/boot.sh
@@ -45,11 +45,6 @@ cd bin
 wget $SVN_DIR/svn-update.sh
 wget $SVN_DIR/env
 
-# fetch screening specific file
-if [ "$SVN_DIR" == "$SVN_DIR_SCREENING" ]; then
-    wget $SVN_DIR/empty-screening-database.sql
-fi
-
 
 source ./svn-update.sh
 
diff --git a/openbis/dist/admin/svn-update.sh b/openbis/dist/admin/svn-update.sh
index 69d642969f41acae8251672bf13868717670b9bf..bce4e7464d38a4630edcdddd19e2951f2aaa33e3 100755
--- a/openbis/dist/admin/svn-update.sh
+++ b/openbis/dist/admin/svn-update.sh
@@ -18,8 +18,8 @@ fi
 WGET_HOME=`which wget`
 
 # download the scripts
-$WGET_HOME --no-directories --directory-prefix $OPENBIS_HOME/bin --no-verbose -r -l1 -A.sh http://$SVN/
+$WGET_HOME -nH --cut-dirs=6 --directory-prefix $OPENBIS_HOME --no-verbose -r -l2 -A.{sh,sql}http://$SVN/
 
 # set permissions
-find $OPENBIS_HOME/bin -type f -name "*.sh" -exec chmod 700 {} \;
+find $OPENBIS_HOME -type f -name "*.sh" -exec chmod 700 {} \;
 
diff --git a/screening/dist/admin/boot.sh b/screening/dist/admin/boot.sh
index 370aa61fd2e9e58ff28c98c4c269118edd3d1cf2..245ed0e000931a5ea57e9f3acf8533c5d9857bcc 100755
--- a/screening/dist/admin/boot.sh
+++ b/screening/dist/admin/boot.sh
@@ -7,6 +7,5 @@ mkdir bin
 cd bin
 wget $SVN_DIR/svn-update.sh
 wget $SVN_DIR/env
-wget $SVN_DIR/empty-screening-database.sql
 . ./svn-update.sh
 cd ..
\ No newline at end of file
diff --git a/screening/dist/admin/svn-update.sh b/screening/dist/admin/svn-update.sh
index a6137ca12876c7f9579b1ac1f7896203be4b33d1..88d2f3e7524a8bfff293dbe9db7d812a1f11a995 100755
--- a/screening/dist/admin/svn-update.sh
+++ b/screening/dist/admin/svn-update.sh
@@ -18,7 +18,7 @@ fi
 WGET_HOME=`which wget`
 
 # download the scripts
-$WGET_HOME --no-directories --directory-prefix $OPENBIS_HOME --no-verbose -r -l1 -A.sh http://$SVN/
+$WGET_HOME -nH --cut-dirs=6 --directory-prefix $OPENBIS_HOME --no-verbose -r -l2 -A.{sh,sql}http://$SVN/
 
 # set permissions
 find $OPENBIS_HOME -type f -name "*.sh" -exec chmod 700 {} \;