diff --git a/release/msi/gg.wxs b/release/msi/gg.wxs
index 4332cd8..03af902 100644
--- a/release/msi/gg.wxs
+++ b/release/msi/gg.wxs
@@ -19,13 +19,13 @@ SPDX-License-Identifier: Apache-2.0
 -->
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Name="gg"
+  <Product Name="gg $(var.GgVersion)"
     Manufacturer="https://gg-scm.io"
     Id="a157faae-3e61-4c5a-a281-cf7477705054"
     UpgradeCode="e258c8c3-2fd4-483a-b41f-402f8eb3246d"
     Language="1033"
     Codepage="1252"
-    Version="1.0.2">
+    Version="$(var.WixGgVersion)">
     <Package Id="*"
       Keywords="Installer"
       Description="gg Installer"
diff --git a/release/msi/release.ps1 b/release/msi/release.ps1
index 2f248fa..a348938 100644
--- a/release/msi/release.ps1
+++ b/release/msi/release.ps1
@@ -14,9 +14,44 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+param($version='')
+
 If ( ! ( Test-Path Env:wix ) ) {
   Write-Error 'WiX not installed; cannot find %wix%.'
   exit 1
 }
-& "${env:wix}bin\\candle.exe" -arch x64 gg.wxs
-& "${env:wix}bin\\light.exe" -ext WixUIExtension -ext WixUtilExtension gg.wixobj
+
+$filename="gg"
+If ( $version -ne '' ) {
+  $filename+="_${version}"
+}
+$filename+=".msi"
+
+$wixVersion="0.0.0"
+$wixVersionMatch=[regex]::Match($version, '^v([0-9]+\.[0-9]+\.[0-9]+)')
+If ( $wixVersionMatch.success ) {
+  $wixVersion=$wixVersionMatch.captures.groups[1].value
+} Elseif ( $version -ne '' ) {
+  Write-Error "Invalid version $version"
+  exit 1
+}
+
+& "${env:wix}bin\\candle.exe" `
+  -nologo `
+  -arch x64 `
+  "-dGgVersion=$version" `
+  "-dWixGgVersion=$wixVersion" `
+  gg.wxs
+If ( $LastExitCode -ne 0 ) {
+  exit $LastExitCode
+}
+& "${env:wix}bin\\light.exe" `
+  -nologo `
+  -ext WixUIExtension `
+  -ext WixUtilExtension `
+  gg.wixobj `
+  -o $filename
+If ( $LastExitCode -ne 0 ) {
+  exit $LastExitCode
+}
+Write-Output "::set-output name=file::${filename}"