diff --git a/windows_deliv/compile_c_libraries.btm b/windows_deliv/compile_c_libraries.btm
index b168724..13e05b7 100644
--- a/windows_deliv/compile_c_libraries.btm
+++ b/windows_deliv/compile_c_libraries.btm
@@ -13,8 +13,10 @@ iff not defined NO_COMPILE then
 	safe_md headers
 	REM "We keep a copy of vendors specific header files at EiffelSoftware as they cannot be"
 	REM "redistributed freely."
-	if not EXIST headers\headers.tar.gz (
-		exprtfile %DEFAULT_ISE_SVN/Src/library/headers.tar.gz > headers\headers.tar.gz
+	if EXIST %INIT_DIR%\isesvn\library\headers\headers.tar.gz (
+		copy %INIT_DIR%\isesvn\library\headers\headers.tar.gz headers\headers.tar.gz
+	) else {
+		exprtfile %DEFAULT_ISE_SVN%/Src/library/headers.tar.gz > headers\headers.tar.gz
 	)
 	cd headers
 	tar xvfz headers.tar.gz
diff --git a/windows_deliv/make_delivery.btm b/windows_deliv/make_delivery.btm
index 903d8d0..ed2f0ec 100644
--- a/windows_deliv/make_delivery.btm
+++ b/windows_deliv/make_delivery.btm
@@ -320,10 +320,10 @@ iff not defined NO_COMPILE then
 	iff not defined NO_ENTERPRISE_BUILD then
 		remtrace ISE specific files
 		cdd %EIFFEL_SRC
-		co %DEFAULT_ISE_SVN/Src/library/keygen library/keygen
+		co %DEFAULT_ISE_SVN%/Src/library/keygen library/keygen
 		cd tools
-		co %DEFAULT_ISE_SVN/Src/tools/activation activation
-		co %DEFAULT_ISE_SVN/Src/tools/estudio_enterprise estudio_enterprise
+		co %DEFAULT_ISE_SVN%/Src/tools/activation activation
+		co %DEFAULT_ISE_SVN%/Src/tools/estudio_enterprise estudio_enterprise
 	endiff
 
 	remtrace Build the normal libraries
diff --git a/windows_deliv/make_exes.btm b/windows_deliv/make_exes.btm
index 6ee671f..84c6743 100644
--- a/windows_deliv/make_exes.btm
+++ b/windows_deliv/make_exes.btm
@@ -285,7 +285,11 @@ endiff
 
 remtrace get GDI+ for platforms that don't have it
 cdd %EIFFEL_SRC\tools
-co %DEFAULT_ISE_SVN/Src/tools/gdiplus gdiplus
+if EXIST %INIT_DIR%\isesvn\tools\gdiplus (
+	xcopy %INIT_DIR%\isesvn\tools\gdiplus gdiplus /E /I
+) else (
+	co %DEFAULT_ISE_SVN%/Src/tools/gdiplus gdiplus
+)
 move gdiplus\gdiplus.dll %INSTALL_DIR\releases
 
 remtrace Recompiling EiffelBuild
diff --git a/windows_deliv/make_installations.btm b/windows_deliv/make_installations.btm
index 2452bdb..ba945b8 100644
--- a/windows_deliv/make_installations.btm
+++ b/windows_deliv/make_installations.btm
@@ -57,7 +57,11 @@ iff .%1.==.. then
 
 	cdd %EIFFEL_SRC
 	cd tools
-	co %DEFAULT_ISE_SVN/Src/tools/setup setup
+	if EXIST %INIT_DIR%\isesvn\tools\setup (
+		xcopy %INIT_DIR%\isesvn\tools\setup setup /E /I
+	) else (
+		co %DEFAULT_ISE_SVN%/Src/tools/setup setup
+	)
 	cd %EIFFEL_SRC\tools\setup\studio
 	clean_project
 	finalize setup.ecf