diff --git a/appveyor.yml b/appveyor.yml
index 8595d7f..7dab24b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,3 +18,5 @@ build_script:
 artifacts:
   - path: bin\win64\AdvancedSettings.zip
     name: portable
+  - path: installer\AdvancedSettings-Installer.exe
+    name: installer
diff --git a/build_windows.cmd b/build_windows.cmd
index 880f8fe..2513ee8 100644
--- a/build_windows.cmd
+++ b/build_windows.cmd
@@ -4,7 +4,7 @@ SET project_dir="%cd%"
 
 echo Set up environment...
 set original_path=%PATH%
-set PATH=%QT%\bin\;C:\Qt\Tools\QtCreator\bin\;C:\Qt\QtIFW2.0.1\bin\;%PATH%
+set PATH=%QT%\bin\;C:\Qt\Tools\QtCreator\bin\;C:\Qt\QtIFW2.0.1\bin\;C:\Program Files (x86)\NSIS\;%PATH%
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
 
 cd "%project_dir%
@@ -32,5 +32,10 @@ copy "%project_dir%\third-party\openvr\bin\win64\openvr_api.dll" "AdvancedSettin
 
 echo Packaging portable archive...
 7z a AdvancedSettings.zip AdvancedSettings
+
+echo Creating installer...
+cd %project_dir%/installer
+makensis installer.nsi
+
 set PATH=%original_path%
 cd %project_dir%
diff --git a/installer/installer.nsi b/installer/installer.nsi
index b2ade6f..58cd90b 100644
--- a/installer/installer.nsi
+++ b/installer/installer.nsi
@@ -6,11 +6,11 @@
 ;--------------------------------
 ;General
 
-	!define BASEDIR "..\bin\win64"
+        !define BASEDIR "..\bin\win64\AdvancedSettings"
 
 	;Name and file
 	Name "OpenVR Advanced Settings"
-	OutFile "OpenVR-AdvancedSettings-Installer.exe"
+        OutFile "AdvancedSettings-Installer.exe"
 	
 	;Default installation folder
 	InstallDir "$PROGRAMFILES64\OpenVR-AdvancedSettings"
@@ -101,7 +101,7 @@ Section "Install" SecInstall
 	SetOutPath "$INSTDIR"
 
 	;ADD YOUR OWN FILES HERE...
-	File "${BASEDIR}\LICENSE"
+        File "${BASEDIR}\LICENSE.txt"
 	File "${BASEDIR}\*.exe"
 	File "${BASEDIR}\*.dll"
 	File "${BASEDIR}\*.bat"