diff --git a/src/setup.py b/src/setup.py
index 3714f34a79..6379a8e9c0 100755
--- a/src/setup.py
+++ b/src/setup.py
@@ -54,7 +54,7 @@
 scripts = []
 
 
-WIN32 = sys.platform.startswith("win")
+WIN32 = sys.platform.startswith("win") or sys.platform.startswith("msys")
 OSX = sys.platform.startswith("darwin")
 PYTHON3 = sys.version_info[0] == 3
 
@@ -1343,7 +1343,10 @@ def add_gui_exe(*args):
             add_console_exe("xpra/client/gl/gl_check.py",   "opengl.ico",       "OpenGL_check")
         if printing_ENABLED:
             add_console_exe("xpra/platform/printing.py",        "printer.ico",     "Print")
-            GSVIEW = "C:\\Program Files\\Ghostgum\\gsview"
+            if os.path.exists("C:\\Program Files (x86)\\Ghostgum\\gsview"):
+                GSVIEW = "C:\\Program Files (x86)\\Ghostgum\\gsview"
+            else:
+                GSVIEW = "C:\\Program Files\\Ghostgum\\gsview"
             GHOSTSCRIPT_PARENT_DIR = "C:\\Program Files\\gs"
             GHOSTSCRIPT = None
             for x in reversed(sorted(os.listdir(GHOSTSCRIPT_PARENT_DIR))):
diff --git a/src/win32/MAKE-INSTALLER.BAT b/src/win32/MAKE-INSTALLER.BAT
index 3bd67ba126..68fb0c057d 100644
--- a/src/win32/MAKE-INSTALLER.BAT
+++ b/src/win32/MAKE-INSTALLER.BAT
@@ -12,13 +12,25 @@ if "%PYTHON%"=="" (
 	REM DEFAULT to Python 2.7:
 	SET PYTHON=C:\Python34
 	SET PYTHON=C:\Python27
-	SET VC=C:\Program Files\Microsoft Visual Studio 9.0\VC
+	SET VC="%ProgramFiles%\Microsoft Visual Studio 9.0\VC"
+	IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC" (
+		SET VC="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC"
+	)
 )
 SET PYTHON_EXE=%PYTHON%\python.exe
 SET PYTHONPATH=.;%PYTHONPATH%
-SET INNOSETUP=C:\Program Files\Inno Setup 5\ISCC.exe
-SET TORTOISESVN=C:\Program Files\TortoiseSVN
-SET ZIP7=C:\Program Files\7-Zip\7z.exe
+SET INNOSETUP="%ProgramFiles%\Inno Setup 5\ISCC.exe"
+IF EXIST "%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe" (
+	SET INNOSETUP="%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe"
+)
+SET TORTOISESVN="%ProgramFiles%\TortoiseSVN"
+IF EXIST "%ProgramFiles(x86)%\TortoiseSVN" (
+	SET TORTOISESVN="%ProgramFiles(x86)%\TortoiseSVN"
+)
+SET ZIP7="%ProgramFiles%\7-Zip\7z.exe"
+IF EXIST "%ProgramFiles(x86)%\7-Zip\7z.exe" (
+	SET ZIP7="%ProgramFiles(x86)%\7-Zip\7z.exe"
+)
 SET SVNVERSION_EXE=svnversion
 SET EXTRA_VERSION=
 SET BUILD_DIR=build
@@ -70,11 +82,11 @@ RMDIR /S /Q %BUILD_DIR% dist Output Temp 2> NUL
 DEL /Q Xpra_Setup*.exe 2> NUL
 DEL /Q cx_freeze-xpra.log build-xpra.log py2exe-xpra.log innosetup.log 2> NUL
 
-if NOT "%VC%"=="" (
+if NOT %VC%=="" (
 	if "%VSINSTALLDIR%"=="" (
 		ECHO ***************************************************************
 		ECHO ****** load Visual Studio env
-		CALL "%VC%\bin\vcvars32.bat"
+		CALL %VC%\bin\vcvars32.bat
 	)
 )