diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05c8f22d..5f385bec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -356,8 +356,10 @@ endif()
 # Windows installer
 #
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-        message (STATUS "Configuring the v1 installer")
-        configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer)
+        message (STATUS "Configuring the wix installer")
+        configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer-wix)
+        message (STATUS "Configuring the inno installer")
+        configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/inno ${CMAKE_BINARY_DIR}/installer-inno)
 endif()
 
 #
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 7deda472..a9995bb7 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -39,7 +39,7 @@ endif()
 if (NOT DEFINED BARRIER_REVISION)
     if (DEFINED ENV{GIT_COMMIT})
         string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION)
-    elseif (BARRIER_VERSION_STAGE STREQUAL "snapshot")
+    else()
         execute_process (
             COMMAND git rev-parse --short=8 HEAD
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
diff --git a/dist/inno/barrier.iss b/dist/inno/barrier.iss.in
similarity index 83%
rename from dist/inno/barrier.iss
rename to dist/inno/barrier.iss.in
index ec774131..6b52bcc9 100644
--- a/dist/inno/barrier.iss
+++ b/dist/inno/barrier.iss.in
@@ -1,5 +1,5 @@
 #define MyAppName "Barrier"
-#define MyAppVersion "1.9"
+#define MyAppVersion "@BARRIER_VERSION@"
 #define MyAppPublisher "Debauchee Open Source Group"
 #define MyAppURL "https://github.com/debauchee/barrier/wiki"
 #define MyAppExeName "barrier.exe"
@@ -18,10 +18,10 @@ AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DisableProgramGroupPage=yes
-LicenseFile=E:\Projects\vs\barrier-release.git\res\License.rtf
-OutputDir=E:\Projects\vs\barrier-release.git\build\installer\bin
-OutputBaseFilename=BarrierSetup
-SetupIconFile=E:\Projects\vs\barrier-release.git\res\barrier.ico
+LicenseFile=@CMAKE_CURRENT_SOURCE_DIR@/res/License.rtf
+OutputDir=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/../installer-inno/bin
+OutputBaseFilename=BarrierSetup-{#MyAppVersion}
+SetupIconFile=@CMAKE_CURRENT_SOURCE_DIR@/res/barrier.ico
 Compression=lzma
 SolidCompression=yes
 ArchitecturesInstallIn64BitMode=x64 ia64
@@ -32,7 +32,7 @@ ArchitecturesInstallIn64BitMode=x64 ia64
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "E:\Projects\vs\barrier-release.git\build\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/Release/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]