diff --git a/.gitignore b/.gitignore
index edfc0d7..fc1043b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,3 @@
 
 # Driver Verification Log
 /wintun.DVL.XML
-
-# WHQL Driver
-/whql/x86
-/whql/amd64
diff --git a/README.md b/README.md
index d9ad60d..c52f3aa 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ ARM64 Release              | `arm64\Release\wintun`
 1. `msbuild wintun.proj /t:DVL;Build`.
 2. Perform Windows Hardware Lab Kit tests.
 3. Submit submission package to Microsoft.
-4. Copy WHQL-signed driver to `whql\x86` and `whql\amd64` subfolders.
+4. Copy WHQL-signed driver to `x86\Release\whql\` and `amd64\Release\whql\` subfolders.
 5. `msbuild wintun.proj /t:MSM`
 6. MSM files are placed in `dist` subfolder.
 
diff --git a/wintun.wixproj b/wintun.wixproj
index 3626628..7e8c7f2 100644
--- a/wintun.wixproj
+++ b/wintun.wixproj
@@ -28,7 +28,7 @@
     <SuppressSpecificWarnings>1006;1086;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
     <LinkerSuppressSpecificWarnings>1103;$(LinkerSuppressSpecificWarnings)</LinkerSuppressSpecificWarnings>
     <SuppressIces>ICE30;$(SuppressIces)</SuppressIces>
-    <LinkerAdditionalOptions>-b output_dir="$(IntermediateOutputPath.TrimEnd('\'))" -b whql_dir="whql\$(WintunPlatform)" $(LinkerAdditionalOptions)</LinkerAdditionalOptions>
+    <LinkerAdditionalOptions>-b output_dir="$(IntermediateOutputPath.TrimEnd('\'))" -b whql_dir="$(WintunPlatform)\$(Configuration)\whql" $(LinkerAdditionalOptions)</LinkerAdditionalOptions>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <SuppressPdbOutput>true</SuppressPdbOutput>