diff --git a/windows/scripts/setup-cygwin.bat b/windows/scripts/setup-cygwin.bat
index cfac808bfecf76c826a9035c7d5e71f6bb479912..8ee2b19900b742ca7d1037d7ff6e8d1b48c688d2 100755
--- a/windows/scripts/setup-cygwin.bat
+++ b/windows/scripts/setup-cygwin.bat
@@ -4,7 +4,7 @@ SETLOCAL
 SET CYGWINHOME=%~1
 SET CYGWINROOT="%~1\cygwin"
 SET DOWNLOADPATH="%CYGWINHOME%\cygwin-packages"
-SET SETUPFILE="%DOWNLOADPATH%\setup.exe"
+SET SETUPFILE="%CYGWINHOME%\setup.exe"
 SET OPTIONS=--no-shortcuts --no-startmenu --quiet-mode --no-verify
 
 IF NOT "%2" == "" GOTO REMOTE_INSTALL
diff --git a/windows/scripts/slapos-all-in-one.iss b/windows/scripts/slapos-all-in-one.iss
index 9ecd788ce18cdfaee2c73ecc6b90b7e7b0999c44..f9e79bf7c3b2a48ec3327c62845c0b337f420f3d 100755
--- a/windows/scripts/slapos-all-in-one.iss
+++ b/windows/scripts/slapos-all-in-one.iss
@@ -32,6 +32,7 @@ Source: "opt\git\slapos.recipe.cmmi\dist\slapos.recipe.cmmi-0.1.tar.gz"; DestDir
 Source: "opt\git\qooxdoo\application\playground\build\*"; DestDir: "{app}\cygwin\etc\slapos\desktop";
 Source: "opt\git\qooxdoo\application\showcase\build\*"; DestDir: "{app}\cygwin\etc\slapos\node";
 
+Source: "setup.exe"; DestDir: "{app}";
 Source: "opt\git\slapos.package\windows\scripts\setup-cygwin.bat"; DestDir: "{app}";
 
 Source: "cygwin\Cygwin-Terminal.ico"; DestDir: "{app}\images"; DestName: "terminal.ico";