diff --git a/tools/install_ewf.bat b/tools/install_ewf.bat
index 80ff0d24..931029f2 100644
--- a/tools/install_ewf.bat
+++ b/tools/install_ewf.bat
@@ -2,7 +2,8 @@
 setlocal
 set TMP_EXCLUDE=%~dp0.install_ewf-copydir-exclude
 set COPYCMD= xcopy /EXCLUDE:%TMP_EXCLUDE% /I /E /Y 
-set SVNCO=svn checkout 
+set SVNCO=svn checkout
+set SVNEXPORT=svn export 
 set TMP_DIR=%~dp0..
 set SAFE_MD=call safe_md
 
@@ -83,34 +84,40 @@ rd /q/s %TMP_CONTRIB_DIR%\library\network\server\nino\example\SimpleWebServer\we
 
 rem #--- IF Missing ---#
 
+:curl
 echo Install cURL if missing
 %SAFE_MD% %TMP_CONTRIB_DIR%\library\network
 if not exist %TMP_TARGET_DIR%\library\cURL %COPYCMD% %TMP_DIR%\contrib\ise_library\cURL	%TMP_CONTRIB_DIR%\library\network\cURL
-if not exist %TMP_TARGET_DIR%\library\cURL if not exist %TMP_CONTRIB_DIR%\library\cURL\cURL.ecf %SVNCO% https://svn.eiffel.com/eiffelstudio/trunk/Src/library/cURL %TMP_CONTRIB_DIR%\library\network\cURL
+if not exist %TMP_TARGET_DIR%\library\cURL if not exist %TMP_CONTRIB_DIR%\library\cURL\cURL.ecf %SVNEXPORT% https://svn.eiffel.com/eiffelstudio/trunk/Src/library/cURL %TMP_CONTRIB_DIR%\library\network\cURL
 
+:json
 echo Install json if missing
 if not exist %TMP_CONTRIB_DIR%\library\text\parser\json %COPYCMD% %TMP_DIR%\contrib\library\text\parser\json	%TMP_CONTRIB_DIR%\library\text\parser\json
-if not exist %TMP_CONTRIB_DIR%\library\text\parser\json\library\json.ecf %SVNCO% https://svn.github.com/eiffelhub/json.git %TMP_CONTRIB_DIR%\library\text\parser\json
+if not exist %TMP_CONTRIB_DIR%\library\text\parser\json\library\json.ecf %SVNEXPORT% https://svn.github.com/eiffelhub/json.git %TMP_CONTRIB_DIR%\library\text\parser\json
 
+:eapml
 echo Install eapml if missing
 if not exist %TMP_CONTRIB_DIR%\library\math\eapml %COPYCMD% %TMP_DIR%\contrib\ise_library\math\eapml	%TMP_CONTRIB_DIR%\library\math\eapml
 
+:eel
 echo Install eel if missing
 if not exist %TMP_CONTRIB_DIR%\library\text\encryption\eel %COPYCMD% %TMP_DIR%\contrib\ise_library\text\encryption\eel	%TMP_CONTRIB_DIR%\library\text\encryption\eel
 
+goto ecf_updating
 rem #--- Update ecf files ---#
 
+:ecf_updating
 cd %TMP_TARGET_DIR%
 
 if -%ECF_UPDATER_PATH%- == -- goto use_bin_dir
 set TMP_ECF_UPDATER_CMD=%ECF_UPDATER_PATH%\ecf_updater.exe
-goto ecf_update
+goto call_ecf_update
 
 :use_bin_dir
 set TMP_ECF_UPDATER_CMD=%~dp0\bin\ecf_updater.bat
-goto ecf_update
+goto call_ecf_update
 
-:ecf_update
+:call_ecf_update
 call %TMP_ECF_UPDATER_CMD% --force %2 %3 %4 %5 %6 %7 %8 %9 contrib
 
 :end
diff --git a/tools/install_ewf.sh b/tools/install_ewf.sh
index b22e9ea8..b64d3ba9 100644
--- a/tools/install_ewf.sh
+++ b/tools/install_ewf.sh
@@ -9,7 +9,10 @@ CLEANDIR() {
 	done
 }
 SVNCO() {
-	svn co $1 $2
+	svn checkout $1 $2
+}
+SVNEXPORT() {
+	svn export $1 $2
 }
 COPYCMD() {
 	if [ -d "$1" ]; then
@@ -81,7 +84,7 @@ mkdir -p $TMP_CONTRIB_DIR/library/network
 COPYCMDIFMISSING $TMP_TARGET_DIR/library/cURL $TMP_DIR/contrib/ise_library/cURL	$TMP_CONTRIB_DIR/library/network/cURL
 if [ ! -f "$TMP_TARGET_DIR/library/cURL/cURL.ecf" ]; then
 	if [ ! -f "$TMP_CONTRIB_DIR/library/network/cURL/cURL.ecf" ]; then
-		SVNCO https://svn.eiffel.com/eiffelstudio/trunk/Src/library/cURL $TMP_CONTRIB_DIR/library/network/cURL
+		SVNEXPORT https://svn.eiffel.com/eiffelstudio/trunk/Src/library/cURL $TMP_CONTRIB_DIR/library/network/cURL
 	fi
 fi
 
@@ -89,7 +92,7 @@ echo Install json if missing
 mkdir -p $TMP_CONTRIB_DIR/library/text/parser
 COPYCMDIFMISSING $TMP_CONTRIB_DIR/library/text/parser/json $TMP_DIR/contrib/library/text/parser/json	$TMP_CONTRIB_DIR/library/text/parser/json
 if [ ! -f "$TMP_CONTRIB_DIR/library/text/parser/json/library/json.ecf" ]; then
-	SVNCO https://svn.github.com/eiffelhub/json.git $TMP_CONTRIB_DIR/library/text/parser/json
+	SVNEXPORT https://svn.github.com/eiffelhub/json.git $TMP_CONTRIB_DIR/library/text/parser/json
 fi
 
 echo Install eapml if missing