diff --git a/res/Installer.nsi.in b/res/Installer.nsi.in
index ada7d402..69803bbd 100644
--- a/res/Installer.nsi.in
+++ b/res/Installer.nsi.in
@@ -17,6 +17,7 @@
 !define vcRedistFile "vcredist_${arch}.exe"
 !define startMenuApp "qsynergy.exe"
 !define binDir "..\bin"
+!define libDir "..\lib"
 !define uninstall "uninstall.exe"
 !define icon "..\src\gui\res\win\QSynergy.ico"
 !define controlPanelReg "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
@@ -36,7 +37,7 @@
 !insertmacro MUI_LANGUAGE "English"
 
 Name ${product}
-OutFile "${packageName}-${version}-${platform}-${arch}.exe"
+OutFile "..\bin\${packageName}-${version}-${platform}-${arch}.exe"
 InstallDir "${installDirVar}\${product}"
 InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${product}" ""
 
@@ -112,9 +113,9 @@ SectionEnd
 Section "Server and Client" core
 
   ; client and server files
-  File "${binDir}\src\cmd\synergys\Release\synergys.exe"
-  File "${binDir}\src\cmd\synergyc\Release\synergyc.exe"
-  File "${binDir}\src\lib\platform\Release\synrgyhk.dll"
+  File "${binDir}\Release\synergys.exe"
+  File "${binDir}\Release\synergyc.exe"
+  File "${libDir}\Release\synrgyhk.dll"
 
 SectionEnd
 
diff --git a/tools/build/toolchain.py b/tools/build/toolchain.py
index 9b1826c3..3bafd6f1 100644
--- a/tools/build/toolchain.py
+++ b/tools/build/toolchain.py
@@ -561,7 +561,7 @@ class InternalCommands:
 		template = template.replace('${in:qtDir}', qtDir)
 		template = template.replace('${in:installDirVar}', installDirVar)
 
-		nsiPath = 'bin\Installer.nsi'
+		nsiPath = self._bin_dir + '\Installer.nsi'
 		nsiFile = open(nsiPath, 'w')
 		nsiFile.write(template)
 		nsiFile.close()