diff --git a/Docs/SettingUpDevelopmentEnvironment.md b/Docs/SettingUpDevelopmentEnvironment.md
index 0e3fc45b58..3484dd117f 100644
--- a/Docs/SettingUpDevelopmentEnvironment.md
+++ b/Docs/SettingUpDevelopmentEnvironment.md
@@ -49,9 +49,9 @@ Download NUnit from [here](https://nunit.org).
 
 Download and install MSBuild Community Tasks from [here](https://github.com/loresoft/msbuildtasks/releases).
 
-### Wix Toolset 3.10.3
+### Wix Toolset (4.0.6)
 
-Download and install the Wix toolset from [here](https://wix.codeplex.com/releases/view/624906).
+WiX is restored as a NuGet package by running `bootstrap.cmd` (or `build.cmd` which calls bootstrap).
 
 Building the Project the First Time
 -----------------------------------
@@ -123,12 +123,12 @@ MSBuild Community Tasks are missing.
 ```
 "E:\waffle\Waffle.proj" (all target) (1) ->
 "E:\waffle\Waffle.sln" (Clean target) (2) ->
-(Clean target) ->  E:\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj(107,11):
-error MSB4019: The imported project "C:\Program Files\MSBuild\Microsoft\WiX\v3.x\Wix.targets" was not found.
+(Clean target) ->  E:\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj(3,3):
+error MSB4019: The imported project "..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props" was not found.
 Confirm that the path in the <Import> declaration is correct, and that the file exists on disk.
 ```
 
-Wix is missing.
+WiX package restore is missing. Re-run `bootstrap.cmd`.
 
 ### Product Version
 
diff --git a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
index e3a692be09..503386780a 100644
--- a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
+++ b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="..\..\.nuget\packages\WiX.4.0.0.5512-pre\build\wix.props" Condition="Exists('..\..\.nuget\packages\WiX.4.0.0.5512-pre\build\wix.props')" />
+  <Import Project="..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props" Condition="Exists('..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <ProductVersion>3.0</ProductVersion>
@@ -8,8 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>Waffle.Windows.AuthProvider</OutputName>
     <OutputType>Module</OutputType>
-    <WixToolPath>..\..\.nuget\packages\WiX.4.0.0.5512-pre\tools</WixToolPath>
     <RunWixToolsOutOfProc>true</RunWixToolsOutOfProc>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.targets</WixTargetsPath>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -110,12 +110,14 @@
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)" />
+  <Import Project="$(WixTargetsPath)" Condition="Exists('$(WixTargetsPath)')" />
+  <Target Name="FindInvalidProjectReferences" Condition="'$(MSBuildToolsVersion)' == '4.0'" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\.nuget\packages\WiX.4.0.0.5512-pre\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\.nuget\packages\WiX.4.0.0.5512-pre\build\wix.props'))" />
+    <Error Condition="!Exists('..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props'))" />
+    <Error Condition="!Exists('..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.targets'))" />
   </Target>
   <!--
     To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wxs b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wxs
index 943b4d5f37..6cf2180eb3 100644
--- a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wxs
+++ b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wxs
@@ -8,8 +8,7 @@
  <?endif ?>
 <?endif ?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Module Id="WindowsAuthProviderMSM" Language="1033" Version="$(var.ProductVersion)">
-        <Package Id="80101f8b-1c44-4c7d-969b-0731b162d54b" Manufacturer="$(var.CompanyName)" InstallerVersion="200" />
+    <Module Id="WindowsAuthProviderMSM" Guid="80101f8b-1c44-4c7d-969b-0731b162d54b" Language="1033" Version="$(var.ProductVersion)">
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="MergeRedirectFolder">
                 <Component Id="WindowsAuthProvider" Guid="74ad70ef-aa1a-4d8f-a31c-dda1716b7dd1">
diff --git a/Source/WindowsAuthProviderMergeModule/packages.config b/Source/WindowsAuthProviderMergeModule/packages.config
index 3944f00667..964cc956f4 100644
--- a/Source/WindowsAuthProviderMergeModule/packages.config
+++ b/Source/WindowsAuthProviderMergeModule/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WiX" version="4.0.0.4506-pre" />
+  <package id="WixToolset.Sdk" version="4.0.6" />
 </packages>
diff --git a/bootstrap.cmd b/bootstrap.cmd
index 1be738cff3..1a858bbf3a 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -3,4 +3,8 @@ Rmdir .nuget\packages\ /s /q
 NuGet.exe install MSBuildTasks        -OutputDirectory .nuget\packages\ -NonInteractive -Version 1.5.0.235
 NuGet.exe install NUnit               -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.14.0
 NuGet.exe install NUnit.ConsoleRunner -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.17.0
-NuGet.exe install WiX                 -OutputDirectory .nuget\packages\ -NonInteractive -Version 4.0.0.5512-pre -Pre
+NuGet.exe install Microsoft.Build -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
+NuGet.exe install Microsoft.Build.Framework -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
+NuGet.exe install Microsoft.Build.Tasks.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
+NuGet.exe install Microsoft.Build.Utilities.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; $wixPropsContent = Get-Content -Raw $wixPropsFile; $wixPropsContent = $wixPropsContent.Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))').Replace('$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'); [System.IO.File]::WriteAllText($wixPropsFile, $wixPropsContent); $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; $wixTargetsContent = Get-Content -Raw $wixTargetsFile; $wixTargetsContent = $wixTargetsContent.Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))').Replace('$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))').Replace('$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %%(CultureGroup.OutputFolder)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(CabinetCachePath), %%(CultureGroup.OutputFolder))))), ''\''))').Replace('$([MSBuild]::NormalizeDirectory($(IntermediateOutputPath)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($(IntermediateOutputPath))), ''\''))'); [System.IO.File]::WriteAllText($wixTargetsFile, $wixTargetsContent); $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"