diff --git a/appveyor.yml b/appveyor.yml
index 1b671850..01d201fc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.0.0.{build}
+version: 0.0.{build}.0
 
 clone_depth: 1
 
diff --git a/scripts/generate-installers.bat b/scripts/generate-installers.bat
index 379e364a..f6e931e2 100644
--- a/scripts/generate-installers.bat
+++ b/scripts/generate-installers.bat
@@ -12,6 +12,11 @@ if /I "%BUILD_CONFIG%"=="debug" (
 ) else (
     if /I "%BUILD_CONFIG%"=="release" (
         set BUILD_CONFIG=release
+
+        if /I "%APPVEYOR%"=="True" (
+            echo Stamping with AppVeyor version: %APPVEYOR_BUILD_VERSION%
+            echo | set /p dummyName="%APPVEYOR_BUILD_VERSION%" > app\version.txt
+        )
     ) else (
         if /I "%BUILD_CONFIG%"=="signed-release" (
             set BUILD_CONFIG=release
diff --git a/wix/Moonlight/Product.wxs b/wix/Moonlight/Product.wxs
index f306eeb8..53e92b9f 100644
--- a/wix/Moonlight/Product.wxs
+++ b/wix/Moonlight/Product.wxs
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?if $(env.APPVEYOR) = True ?>
+<?define ShortName = "Moonlight (Nightly)" ?>
+<?define FullName = "Moonlight Game Streaming Client (Nightly)" ?>
+<?define InstallFolder = "Moonlight Game Streaming (Nightly)" ?>
+<?define RegKeyName = "Moonlight Game Streaming Project (Nightly)" ?>
+<?define UpgradeCode = "1b3bbb1b-3ee3-4000-adf2-6358eab315f6" ?>
+<?else?>
 <?define ShortName = "Moonlight" ?>
 <?define FullName = "Moonlight Game Streaming Client" ?>
+<?define InstallFolder = "Moonlight Game Streaming" ?>
+<?define RegKeyName = "Moonlight Game Streaming Project" ?>
+<?define UpgradeCode = "5c09f94e-f809-4c6a-9b7b-597c99f041fe" ?>
+<?endif ?>
 
 <?define ShortcutName = "$(var.ShortName)" ?>
 <?define ShortcutDesc = "Stream games from your NVIDIA GameStream-enabled PC" ?>
-<?define InstallFolder = "Moonlight Game Streaming" ?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"
@@ -16,7 +26,7 @@
            Language="1033"
            Version="!(bind.fileVersion.MoonlightExe)"
            Manufacturer="Moonlight Game Streaming Project"
-           UpgradeCode="5c09f94e-f809-4c6a-9b7b-597c99f041fe">
+           UpgradeCode="$(var.UpgradeCode)">
 
     <Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
 
@@ -62,7 +72,7 @@
                 WorkingDirectory="INSTALLFOLDER" />
       <RemoveFolder Id="CleanupStartMenuShortcut" Directory="ApplicationProgramsFolder" On="uninstall" />
       <util:RemoveFolderEx Id="CleanupAppDataFolder" On="uninstall" Property="APPDATAFOLDER" />
-      <RegistryValue Root="HKCU" Key="Software\Moonlight Game Streaming Project" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
+      <RegistryValue Root="HKCU" Key="Software\$(var.RegKeyName)" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
     </Component>
 
     <Component Id="MoonlightDesktopShortcut" Guid="*" Directory="INSTALLFOLDER">
@@ -74,7 +84,7 @@
                 WorkingDirectory="INSTALLFOLDER" />
       <RemoveFolder Id="CleanupDesktopShortcut" Directory="DesktopFolder" On="uninstall" />
       <RegistryValue Root="HKCU"
-                     Key="Software\Moonlight Game Streaming Project"
+                     Key="Software\$(var.RegKeyName)"
                      Name="DesktopShortcutInstalled"
                      Type="integer"
                      Value="1"
@@ -87,7 +97,7 @@
          product -->
     <Component Id="MoonlightDesktopShortcutState" Guid="*" Directory="INSTALLFOLDER">
       <RegistryValue Root="HKCU"
-                     Key="Software\Moonlight Game Streaming Project"
+                     Key="Software\$(var.RegKeyName)"
                      Name="DesktopShortcutInstallState"
                      Type="integer"
                      Value="[ADDDESKTOPSHORTCUT]"
diff --git a/wix/MoonlightSetup/Bundle.wxs b/wix/MoonlightSetup/Bundle.wxs
index a99e840f..d6dcb526 100644
--- a/wix/MoonlightSetup/Bundle.wxs
+++ b/wix/MoonlightSetup/Bundle.wxs
@@ -1,13 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?if $(env.APPVEYOR) = True ?>
+<?define FullName = "Moonlight Game Streaming Client (Nightly)" ?>
+<?define InstallFolder = "Moonlight Game Streaming (Nightly)" ?>
+<?define RegKeyName = "Moonlight Game Streaming Project (Nightly)" ?>
+<?define UpgradeCode = "12825490-fd66-4f80-87f9-56531ca66421" ?>
+<?else?>
+<?define FullName = "Moonlight Game Streaming Client" ?>
+<?define InstallFolder = "Moonlight Game Streaming" ?>
+<?define RegKeyName = "Moonlight Game Streaming Project" ?>
+<?define UpgradeCode = "466fa35d-4be4-40ef-9ce5-afadc3b63bc5" ?>
+<?endif ?>
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
-  <Bundle Name="Moonlight Game Streaming Client"
+  <Bundle Name="$(var.FullName)"
           Version="!(bind.PackageVersion.Moonlight)"
           Manufacturer="Moonlight Game Streaming Project"
-          UpgradeCode="466fa35d-4be4-40ef-9ce5-afadc3b63bc5"
+          UpgradeCode="$(var.UpgradeCode)"
           HelpUrl="https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide"
           UpdateUrl="https://github.com/moonlight-stream/moonlight-qt/releases"
           DisableModify="yes"
@@ -31,9 +43,9 @@
     <Variable Name="REINSTALLMODE" bal:Overridable="yes" Value="dmus" />
 
     <?if $(env.ARCH) ~= x64 ?>
-      <Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]Moonlight Game Streaming" />
+      <Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]$(var.InstallFolder)" />
     <?elseif $(env.ARCH) ~= x86 ?>
-      <Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]Moonlight Game Streaming" />
+      <Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]$(var.InstallFolder)" />
     <?endif ?>
 
     <!-- Define "Add desktop shortcut" -checkbox's state by defining a variable
@@ -45,12 +57,12 @@
          "DesktopShortcutInstallState" is set in Product.wxs. -->
     <util:RegistrySearch Variable="HasDesktopShortcutInstallStateRegKey"
                          Root="HKCU"
-                         Key="Software\Moonlight Game Streaming Project"
+                         Key="Software\$(var.RegKeyName)"
                          Value="DesktopShortcutInstallState"
                          Result="exists" />
     <util:RegistrySearch Variable="AddDesktopShortcutCheckbox"
                          Root="HKCU"
-                         Key="Software\Moonlight Game Streaming Project"
+                         Key="Software\$(var.RegKeyName)"
                          Value="DesktopShortcutInstallState"
                          Condition="HasDesktopShortcutInstallStateRegKey" />