diff --git a/res/Installer.nsi.in b/res/Installer.nsi.in
index 044a4768..7ba62c5b 100644
--- a/res/Installer.nsi.in
+++ b/res/Installer.nsi.in
@@ -20,225 +20,5 @@
 !define qtDir ${in:qtDir}
 !define installDirVar ${in:installDirVar}
 
-; normal variables
-!define product "Synergy"
-!define productOld "Synergy+"
-!define packageName "synergy"
-!define packageNameOld "synergy-plus"
-!define platform "Windows"
-!define publisher "The Synergy Project"
-!define publisherOld "The Synergy+ Project"
-!define helpUrl "http://synergy-foss.org/support"
-!define vcRedistFile "vcredist_${arch}.exe"
-!define startMenuApp "synergy.exe"
-!define binDir "..\bin"
-!define uninstall "uninstall.exe"
-!define icon "..\res\synergy.ico"
-!define controlPanelReg "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
-
-!define MUI_ICON ${icon}
-!define MUI_UNICON ${icon}
-
-!include "MUI2.nsh"
-
 !addincludedir ..\res
-!include "DefineIfExist.nsh"
-!include "avgtb.nsh"
-
-!insertmacro MUI_PAGE_LICENSE "..\\res\\License.rtf"
-Page custom avgPageEnter avgPageLeave
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_LANGUAGE "English"
-
-Name ${product}
-OutFile "..\bin\${packageName}-${version}-${platform}-${arch}.exe"
-InstallDir "${installDirVar}\${product}"
-InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${product}" ""
-
-; delete files we installed, and then dir if it's empty
-!macro DeleteFiles dir
-
-  Delete "${dir}\synergy.exe"
-  Delete "${dir}\synergyc.exe"
-  Delete "${dir}\synergys.exe"
-  Delete "${dir}\synergyd.exe"
-  Delete "${dir}\synergyd.log"
-  Delete "${dir}\launcher.exe"
-  Delete "${dir}\synrgyhk.dll"
-  Delete "${dir}\libgcc_s_dw2-1.dll"
-  Delete "${dir}\mingwm10.dll"
-  Delete "${dir}\QtCore4.dll"
-  Delete "${dir}\QtGui4.dll"
-  Delete "${dir}\QtNetwork4.dll"
-  Delete "${dir}\Uninstall.exe"
-  Delete "${dir}\uninstall.exe"
-  Delete "${dir}\synxinhk.dll"
-  Delete "${dir}\sxinpx13.dll"
-  RMDir "${dir}"
-
-!macroend
-
-Section
-
-  SetShellVarContext all
-  SetOutPath "$INSTDIR"
-  
-  ; stops and removes all services (including legacy)
-  ExecWait "$INSTDIR\synergyd.exe /uninstall"
-
-  ; force kill all synergy processes
-  nsExec::Exec "taskkill /f /im synergy.exe"
-  nsExec::Exec "taskkill /f /im qsynergy.exe"
-  nsExec::Exec "taskkill /f /im launcher.exe"
-  nsExec::Exec "taskkill /f /im synergys.exe"
-  nsExec::Exec "taskkill /f /im synergyc.exe"
-  nsExec::Exec "taskkill /f /im synergyd.exe"
-
-  ; clean up legacy files that may exist (but leave user files)
-  !insertmacro DeleteFiles "$PROGRAMFILES32\${product}\bin"
-  !insertmacro DeleteFiles "$PROGRAMFILES64\${product}\bin"
-  !insertmacro DeleteFiles "$PROGRAMFILES32\${productOld}\bin"
-  !insertmacro DeleteFiles "$PROGRAMFILES64\${productOld}\bin"
-  !insertmacro DeleteFiles "$PROGRAMFILES32\${product}"
-  !insertmacro DeleteFiles "$PROGRAMFILES64\${product}"
-  !insertmacro DeleteFiles "$PROGRAMFILES32\${productOld}"
-  !insertmacro DeleteFiles "$PROGRAMFILES64\${productOld}"
-
-  ; clean up legacy start menu entries
-  RMDir /R "$SMPROGRAMS\${product}"
-  RMDir /R "$SMPROGRAMS\${productOld}"
-
-  ; always delete any existing uninstall info
-  DeleteRegKey HKLM "${controlPanelReg}\${product}"
-  DeleteRegKey HKLM "${controlPanelReg}\${productOld}"
-  DeleteRegKey HKLM "${controlPanelReg}\${publisher}"
-  DeleteRegKey HKLM "${controlPanelReg}\${publisherOld}"
-  DeleteRegKey HKLM "${controlPanelReg}\${packageNameOld}"
-  DeleteRegKey HKLM "SOFTWARE\${product}"
-  DeleteRegKey HKLM "SOFTWARE\${productOld}"
-  DeleteRegKey HKLM "SOFTWARE\${publisher}"
-  DeleteRegKey HKLM "SOFTWARE\${publisherOld}"
-
-  ; create uninstaller (used for control panel icon)
-  WriteUninstaller "$INSTDIR\${uninstall}"
-
-  ; add new uninstall info
-  WriteRegStr HKLM "${controlPanelReg}\${product}" "" $INSTDIR
-  WriteRegStr HKLM "${controlPanelReg}\${product}" "DisplayName" "${product}"
-  WriteRegStr HKLM "${controlPanelReg}\${product}" "DisplayVersion" "${version}"
-  WriteRegStr HKLM "${controlPanelReg}\${product}" "DisplayIcon" "$INSTDIR\uninstall.exe"
-  WriteRegStr HKLM "${controlPanelReg}\${product}" "Publisher" "${publisher}"
-  WriteRegStr HKLM "${controlPanelReg}\${product}" "UninstallString" "$INSTDIR\uninstall.exe"
-  WriteRegStr HKLM "${controlPanelReg}\${product}" "URLInfoAbout" "${helpUrl}"
-
-SectionEnd
-
-Section "Visual C++ Redistributable" vcredist
-
-  ; this must run first, as some sections run
-  ; binaries that require a vcredist to be installed.
-  ; copy redist file, run it, then delete when done
-  File "${vcRedistDir}\${vcRedistFile}"
-  ExecWait "$INSTDIR\${vcRedistFile} /install /q /norestart"
-  Delete $INSTDIR\${vcRedistFile}
-
-SectionEnd
-
-Section "Server and Client" core
-
-  ; client and server files
-  File "${binDir}\Release\synergys.exe"
-  File "${binDir}\Release\synergyc.exe"
-  File "${binDir}\Release\synergyd.exe"
-  
-  ; try to replace synrgyhk.dll
-  ClearErrors
-  FileOpen $R0 "synrgyhk.dll" w
-  ${If} ${Errors}
-    messageBox MB_OK \
-      "Skipping the file synrgyhk.dll, which is being used by another program. \
-      To resolve this problem, please restart your computer and re-run setup."
-  ${Else}
-    File "${binDir}\Release\synrgyhk.dll"
-  ${EndIf}
-  
-  ; install and run the service
-  ExecWait "$INSTDIR\synergyd.exe /install"
-
-SectionEnd
-
-!ifdef gameDeviceSupport
-Section "Game Device Support" gamedev
-
-  ; files for xinput support
-  File "${binDir}\Release\synxinhk.dll"
-  File "${binDir}\Release\sxinpx13.dll"
-
-SectionEnd
-!endif
-
-Section "Graphical User Interface" gui
-
-  ; gui and qt libs
-  File "${binDir}\Release\synergy.exe"
-  File "${qtDir}\qt\bin\libgcc_s_dw2-1.dll"
-  File "${qtDir}\qt\bin\mingwm10.dll"
-  File "${qtDir}\qt\bin\QtGui4.dll"
-  File "${qtDir}\qt\bin\QtCore4.dll"
-  File "${qtDir}\qt\bin\QtNetwork4.dll"
-
-  ; gui start menu shortcut
-  SetShellVarContext all
-  CreateShortCut "$SMPROGRAMS\${product}.lnk" "$INSTDIR\${startMenuApp}"
-
-SectionEnd
-
-Section "AVG Security Toolbar"
-  Call avgToolbarInstall
-SectionEnd
-
-Section Uninstall
-
-  SetShellVarContext all
-  
-  ; stop and uninstall the service
-  ExecWait "$INSTDIR\synergyd.exe /uninstall"
-
-  ; force kill all synergy processes
-  nsExec::Exec "taskkill /f /im synergy.exe"
-  nsExec::Exec "taskkill /f /im qsynergy.exe"
-  nsExec::Exec "taskkill /f /im launcher.exe"
-  nsExec::Exec "taskkill /f /im synergys.exe"
-  nsExec::Exec "taskkill /f /im synergyc.exe"
-  nsExec::Exec "taskkill /f /im synergyd.exe"
-
-  ; delete start menu shortcut
-  Delete "$SMPROGRAMS\${product}.lnk"
-
-  ; delete all registry keys
-  DeleteRegKey HKLM "SOFTWARE\${product}"
-  DeleteRegKey HKLM "${controlPanelReg}\${product}"
-
-  ; note: edit macro to delete more files.
-  !insertmacro DeleteFiles $INSTDIR
-  Delete "$INSTDIR\${uninstall}"
-
-  ; delete (only if empty, so we don't delete user files)
-  RMDir "$INSTDIR"
-
-SectionEnd
-
-Function .onInstSuccess
-
-  ; start the GUI automatically.
-  Exec "$INSTDIR\synergy.exe"
-  
-  ; HACK: wait 5 secs for the GUI to take focus.
-  Sleep 5000
-
-FunctionEnd
\ No newline at end of file
+!include "synergy.nsh"
diff --git a/res/synergy.nsh b/res/synergy.nsh
new file mode 100644
index 00000000..3bf8f83f
--- /dev/null
+++ b/res/synergy.nsh
@@ -0,0 +1,221 @@
+; normal variables
+!define product "Synergy"
+!define productOld "Synergy+"
+!define packageName "synergy"
+!define packageNameOld "synergy-plus"
+!define platform "Windows"
+!define publisher "The Synergy Project"
+!define publisherOld "The Synergy+ Project"
+!define helpUrl "http://synergy-foss.org/support"
+!define vcRedistFile "vcredist_${arch}.exe"
+!define startMenuApp "synergy.exe"
+!define binDir "..\bin"
+!define uninstall "uninstall.exe"
+!define icon "..\res\synergy.ico"
+!define controlPanelReg "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
+
+!define MUI_ICON ${icon}
+!define MUI_UNICON ${icon}
+
+!include "MUI2.nsh"
+!include "DefineIfExist.nsh"
+!include "avgtb.nsh"
+
+!insertmacro MUI_PAGE_LICENSE "..\\res\\License.rtf"
+Page custom avgPageEnter avgPageLeave
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+Name ${product}
+OutFile "..\bin\${packageName}-${version}-${platform}-${arch}.exe"
+InstallDir "${installDirVar}\${product}"
+InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${product}" ""
+
+; delete files we installed, and then dir if it's empty
+!macro DeleteFiles dir
+
+  Delete "${dir}\synergy.exe"
+  Delete "${dir}\synergyc.exe"
+  Delete "${dir}\synergys.exe"
+  Delete "${dir}\synergyd.exe"
+  Delete "${dir}\synergyd.log"
+  Delete "${dir}\launcher.exe"
+  Delete "${dir}\synrgyhk.dll"
+  Delete "${dir}\libgcc_s_dw2-1.dll"
+  Delete "${dir}\mingwm10.dll"
+  Delete "${dir}\QtCore4.dll"
+  Delete "${dir}\QtGui4.dll"
+  Delete "${dir}\QtNetwork4.dll"
+  Delete "${dir}\Uninstall.exe"
+  Delete "${dir}\uninstall.exe"
+  Delete "${dir}\synxinhk.dll"
+  Delete "${dir}\sxinpx13.dll"
+  RMDir "${dir}"
+
+!macroend
+
+Section
+
+  SetShellVarContext all
+  SetOutPath "$INSTDIR"
+  
+  ; stops and removes all services (including legacy)
+  ExecWait "$INSTDIR\synergyd.exe /uninstall"
+
+  ; force kill all synergy processes
+  nsExec::Exec "taskkill /f /im synergy.exe"
+  nsExec::Exec "taskkill /f /im qsynergy.exe"
+  nsExec::Exec "taskkill /f /im launcher.exe"
+  nsExec::Exec "taskkill /f /im synergys.exe"
+  nsExec::Exec "taskkill /f /im synergyc.exe"
+  nsExec::Exec "taskkill /f /im synergyd.exe"
+
+  ; clean up legacy files that may exist (but leave user files)
+  !insertmacro DeleteFiles "$PROGRAMFILES32\${product}\bin"
+  !insertmacro DeleteFiles "$PROGRAMFILES64\${product}\bin"
+  !insertmacro DeleteFiles "$PROGRAMFILES32\${productOld}\bin"
+  !insertmacro DeleteFiles "$PROGRAMFILES64\${productOld}\bin"
+  !insertmacro DeleteFiles "$PROGRAMFILES32\${product}"
+  !insertmacro DeleteFiles "$PROGRAMFILES64\${product}"
+  !insertmacro DeleteFiles "$PROGRAMFILES32\${productOld}"
+  !insertmacro DeleteFiles "$PROGRAMFILES64\${productOld}"
+
+  ; clean up legacy start menu entries
+  RMDir /R "$SMPROGRAMS\${product}"
+  RMDir /R "$SMPROGRAMS\${productOld}"
+
+  ; always delete any existing uninstall info
+  DeleteRegKey HKLM "${controlPanelReg}\${product}"
+  DeleteRegKey HKLM "${controlPanelReg}\${productOld}"
+  DeleteRegKey HKLM "${controlPanelReg}\${publisher}"
+  DeleteRegKey HKLM "${controlPanelReg}\${publisherOld}"
+  DeleteRegKey HKLM "${controlPanelReg}\${packageNameOld}"
+  DeleteRegKey HKLM "SOFTWARE\${product}"
+  DeleteRegKey HKLM "SOFTWARE\${productOld}"
+  DeleteRegKey HKLM "SOFTWARE\${publisher}"
+  DeleteRegKey HKLM "SOFTWARE\${publisherOld}"
+
+  ; create uninstaller (used for control panel icon)
+  WriteUninstaller "$INSTDIR\${uninstall}"
+
+  ; add new uninstall info
+  WriteRegStr HKLM "${controlPanelReg}\${product}" "" $INSTDIR
+  WriteRegStr HKLM "${controlPanelReg}\${product}" "DisplayName" "${product}"
+  WriteRegStr HKLM "${controlPanelReg}\${product}" "DisplayVersion" "${version}"
+  WriteRegStr HKLM "${controlPanelReg}\${product}" "DisplayIcon" "$INSTDIR\uninstall.exe"
+  WriteRegStr HKLM "${controlPanelReg}\${product}" "Publisher" "${publisher}"
+  WriteRegStr HKLM "${controlPanelReg}\${product}" "UninstallString" "$INSTDIR\uninstall.exe"
+  WriteRegStr HKLM "${controlPanelReg}\${product}" "URLInfoAbout" "${helpUrl}"
+
+SectionEnd
+
+Section "Visual C++ Redistributable" vcredist
+
+  ; this must run first, as some sections run
+  ; binaries that require a vcredist to be installed.
+  ; copy redist file, run it, then delete when done
+  File "${vcRedistDir}\${vcRedistFile}"
+  ExecWait "$INSTDIR\${vcRedistFile} /install /q /norestart"
+  Delete $INSTDIR\${vcRedistFile}
+
+SectionEnd
+
+Section "Server and Client" core
+
+  ; client and server files
+  File "${binDir}\Release\synergys.exe"
+  File "${binDir}\Release\synergyc.exe"
+  File "${binDir}\Release\synergyd.exe"
+  
+  ; try to replace synrgyhk.dll
+  ClearErrors
+  FileOpen $R0 "synrgyhk.dll" w
+  ${If} ${Errors}
+    messageBox MB_OK \
+      "Skipping the file synrgyhk.dll, which is being used by another program. \
+      To resolve this problem, please restart your computer and re-run setup."
+  ${Else}
+	FileClose $R0
+    File "${binDir}\Release\synrgyhk.dll"
+  ${EndIf}
+  
+  ; install and run the service
+  ExecWait "$INSTDIR\synergyd.exe /install"
+
+SectionEnd
+
+!ifdef gameDeviceSupport
+Section "Game Device Support" gamedev
+
+  ; files for xinput support
+  File "${binDir}\Release\synxinhk.dll"
+  File "${binDir}\Release\sxinpx13.dll"
+
+SectionEnd
+!endif
+
+Section "Graphical User Interface" gui
+
+  ; gui and qt libs
+  File "${binDir}\Release\synergy.exe"
+  File "${qtDir}\qt\bin\libgcc_s_dw2-1.dll"
+  File "${qtDir}\qt\bin\mingwm10.dll"
+  File "${qtDir}\qt\bin\QtGui4.dll"
+  File "${qtDir}\qt\bin\QtCore4.dll"
+  File "${qtDir}\qt\bin\QtNetwork4.dll"
+
+  ; gui start menu shortcut
+  SetShellVarContext all
+  CreateShortCut "$SMPROGRAMS\${product}.lnk" "$INSTDIR\${startMenuApp}"
+
+SectionEnd
+
+Section "AVG Security Toolbar"
+  Call avgToolbarInstall
+SectionEnd
+
+Section Uninstall
+
+  SetShellVarContext all
+  
+  ; stop and uninstall the service
+  ExecWait "$INSTDIR\synergyd.exe /uninstall"
+
+  ; force kill all synergy processes
+  nsExec::Exec "taskkill /f /im synergy.exe"
+  nsExec::Exec "taskkill /f /im qsynergy.exe"
+  nsExec::Exec "taskkill /f /im launcher.exe"
+  nsExec::Exec "taskkill /f /im synergys.exe"
+  nsExec::Exec "taskkill /f /im synergyc.exe"
+  nsExec::Exec "taskkill /f /im synergyd.exe"
+
+  ; delete start menu shortcut
+  Delete "$SMPROGRAMS\${product}.lnk"
+
+  ; delete all registry keys
+  DeleteRegKey HKLM "SOFTWARE\${product}"
+  DeleteRegKey HKLM "${controlPanelReg}\${product}"
+
+  ; note: edit macro to delete more files.
+  !insertmacro DeleteFiles $INSTDIR
+  Delete "$INSTDIR\${uninstall}"
+
+  ; delete (only if empty, so we don't delete user files)
+  RMDir "$INSTDIR"
+
+SectionEnd
+
+Function .onInstSuccess
+
+  ; start the GUI automatically.
+  Exec "$INSTDIR\synergy.exe"
+  
+  ; HACK: wait 5 secs for the GUI to take focus.
+  Sleep 5000
+
+FunctionEnd