diff --git a/dist.sh b/dist.sh
index d53f30d95..2aa655503 100644
--- a/dist.sh
+++ b/dist.sh
@@ -54,9 +54,9 @@ rm -f dist/ReleasePDBs{32,64}/*.{exp,lib,metagen} dist/Release{32,64}/*.vshost.*
 # In the 64bit release folder, make an x86 subfolder and copy in renderdoc 32bit
 mkdir -p dist/Release64/x86
 rm -rf dist/Release32/pdblocate/x64 dist/ReleasePDBs32/pdblocate/x64
-cp -R dist/Release32/{d3dcompiler_47.dll,renderdoc.dll,renderdocshim32.dll,renderdoccmd.exe,pdblocate} dist/Release64/x86/
+cp -R dist/Release32/{d3dcompiler_47.dll,renderdoc.dll,renderdoc.json,renderdocshim32.dll,renderdoccmd.exe,pdblocate} dist/Release64/x86/
 mkdir -p dist/ReleasePDBs64/x86
-cp -R dist/ReleasePDBs32/{d3dcompiler_47.dll,renderdoc.dll,renderdoc.pdb,renderdocshim32.dll,renderdocshim32.pdb,renderdoccmd.exe,renderdoccmd.pdb,pdblocate} dist/ReleasePDBs64/x86/
+cp -R dist/ReleasePDBs32/{d3dcompiler_47.dll,renderdoc.dll,renderdoc.json,renderdoc.pdb,renderdocshim32.dll,renderdocshim32.pdb,renderdoccmd.exe,renderdoccmd.pdb,pdblocate} dist/ReleasePDBs64/x86/
 
 if [[ $AUTOBUILD -eq 0 ]]; then
 	echo "Ready to make installer MSIs - make sure to bump version numbers on package."
diff --git a/installer/Installer32.wxs b/installer/Installer32.wxs
index 61dcf302c..e65716649 100644
--- a/installer/Installer32.wxs
+++ b/installer/Installer32.wxs
@@ -77,6 +77,7 @@
 
           <Component Id='RenderDocCPP' Guid='2E6F718F-8BCC-4D41-9688-E99CF2F6B303'>
             <File Id='RenderDocCPP' Name='renderdoc.dll' DiskId='1' Source='dist/Release32/renderdoc.dll' KeyPath='yes' />
+            <File Id='RenderDocJSON' Name='renderdoc.json' DiskId='1' Source='dist/Release32/renderdoc.json' />
             <File Id='D3DCompiler47' Name='d3dcompiler_47.dll' DiskId='1' Source='dist/Release32/d3dcompiler_47.dll' />
             <File Id='RenderDocSHIM' Name='renderdocshim32.dll' DiskId='1' Source='dist/Release32/renderdocshim32.dll' />
 
@@ -91,6 +92,12 @@
               Value='[#RenderDocCPP]' 
               Type="expandable" />
 
+            <RegistryValue Root="HKLM" Id="RDCVulkanImplicitLayer" Action="write"
+              Key="Software\Khronos\Vulkan\ImplicitLayers" 
+              Name='[#RenderDocJSON]'
+              Value='0'
+              Type="integer" />
+
           </Component>
 
           <Component Id='LICENSE' Guid='107AD4E6-D64F-4284-A1F6-D8AAAA6CFC42'>
diff --git a/installer/Installer64.wxs b/installer/Installer64.wxs
index 9efd93c4a..b1dcc99ba 100644
--- a/installer/Installer64.wxs
+++ b/installer/Installer64.wxs
@@ -67,6 +67,7 @@
 
 					<Component Id='RenderDocCPP' Win64="yes" Guid='9D5949F9-0447-47B6-829D-77465E1FDAD9'>
 						<File Id='RenderDocCPP' Name='renderdoc.dll' DiskId='1' Source='dist/Release64/renderdoc.dll' KeyPath='yes' />
+						<File Id='RenderDocJSON' Name='renderdoc.json' DiskId='1' Source='dist/Release64/renderdoc.json' />
 						<File Id='D3DCompiler47DLL64' Name='d3dcompiler_47.dll' DiskId='1' Source='dist/Release64/d3dcompiler_47.dll' />
 						<File Id='RenderDocSHIM' Name='renderdocshim64.dll' DiskId='1' Source='dist/Release64/renderdocshim64.dll' />
 						
@@ -81,6 +82,11 @@
 							Value='[#RenderDocCPP]' 
 							Type="expandable" />
 
+						<RegistryValue Root="HKLM" Id="RDCVulkanImplicitLayer" Action="write"
+							Key="Software\Khronos\Vulkan\ImplicitLayers" 
+							Name='[#RenderDocJSON]'
+							Value='0'
+							Type="integer" />
 					</Component>
 
 					<Component Id='LICENSE' Win64="yes" Guid='71534ACB-DF6B-4956-A14C-566925D77AB0'>
@@ -140,6 +146,7 @@
 					<Directory Id='renderdocX86' Name='x86'>
 						<Component Id='renderdocX86Bins' Win64="yes" Guid='EB58A048-899A-4239-B229-DA9781C431F8'>
 							<File Id='renderdocX86DLL' Name='renderdoc.dll' DiskId='1' Source='dist/Release64/x86/renderdoc.dll' KeyPath='yes' />
+							<File Id='renderdocX86JSON' Name='renderdoc.json' DiskId='1' Source='dist/Release64/x86/renderdoc.json' />
 							<File Id='renderdocshimX86DLL' Name='renderdocshim32.dll' DiskId='1' Source='dist/Release64/x86/renderdocshim32.dll' />
 							<File Id='renderdocX86CMD' Name='renderdoccmd.exe' DiskId='1' Source='dist/Release64/x86/renderdoccmd.exe' />
 
@@ -154,6 +161,12 @@
 								Value='[#renderdocX86DLL]' 
 								Type="expandable" />
 
+							<RegistryValue Root="HKLM" Id="RDCVulkanImplicitLayer32" Action="write"
+								Key="Software\Wow6432Node\Khronos\Vulkan\ImplicitLayers" 
+								Name='[#renderdocX86JSON]'
+								Value='0'
+								Type="integer" />
+
 						</Component>
 
 						<Directory Id='pdblocateX86' Name='pdblocate'>