diff --git a/scripts/dist.sh b/scripts/dist.sh
index 5d8d554ab..618507ede 100644
--- a/scripts/dist.sh
+++ b/scripts/dist.sh
@@ -51,6 +51,10 @@ cp /c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Redist/D3D/x86/d3dcompiler_47.dl
 cp LICENSE.md Documentation/htmlhelp/*.chm dist/Release64/
 cp LICENSE.md Documentation/htmlhelp/*.chm dist/Release32/
 
+# Copy in appropriate plugins folder if they exist
+cp -R plugins-win64/ dist/Release64/plugins
+cp -R plugins-win32/ dist/Release32/plugins
+
 # Delete new VS2015 incremental pdb files, these are just build artifacts
 # and aren't needed for later symbol resolution etc
 find dist/Release{32,64}/ -iname '*.ipdb' -exec rm '{}' \;
diff --git a/scripts/installer/Installer32.wxs b/scripts/installer/Installer32.wxs
index e45b75c49..823b7095c 100644
--- a/scripts/installer/Installer32.wxs
+++ b/scripts/installer/Installer32.wxs
@@ -140,6 +140,18 @@
             </File>
           </Component>
 
+          <Directory Id='plugins' Name='plugins'>
+            <Directory Id='plugins_amd' Name='amd'>
+              <Directory Id='plugins_amd_isa' Name='isa'>
+                <Component Id='gcn_plugin' Guid='B7DBB513-E971-43F9-A0D5-B3AF279DA07B'>
+                  <File Id='amdspvEXE' Name='amdspv.exe' DiskId='1' Source='dist/Release32/plugins/amd/isa/amdspv.exe' KeyPath='yes' />
+                  <File Id='spvgenDLL' Name='spvgen.dll' DiskId='1' Source='dist/Release32/plugins/amd/isa/spvgen.dll' />
+                  <File Id='virtualcontextEXE' Name='VirtualContext.exe' DiskId='1' Source='dist/Release32/plugins/amd/isa/VirtualContext.exe' />
+                </Component>
+              </Directory>
+            </Directory>
+          </Directory>
+
         </Directory>
       </Directory>
 
@@ -246,6 +258,8 @@
 
         <ComponentRef Id='LICENSE' />
 
+        <ComponentRef Id='gcn_plugin' />
+
         <ComponentRef Id='Scintilla' />
         <ComponentRef Id='DockingUI' />
 
diff --git a/scripts/installer/Installer64.wxs b/scripts/installer/Installer64.wxs
index 55641db75..ad180a80c 100644
--- a/scripts/installer/Installer64.wxs
+++ b/scripts/installer/Installer64.wxs
@@ -129,6 +129,18 @@
 						</File>
 					</Component>
 
+					<Directory Id='plugins' Name='plugins'>
+						<Directory Id='plugins_amd' Name='amd'>
+							<Directory Id='plugins_amd_isa' Name='isa'>
+								<Component Id='gcn_plugin' Win64="yes" Guid='02B13D5B-DA43-4AFF-B35B-CF4A241C2CEE'>
+									<File Id='amdspvEXE' Name='amdspv.exe' DiskId='1' Source='dist/Release64/plugins/amd/isa/amdspv.exe' KeyPath='yes' />
+									<File Id='spvgenDLL' Name='spvgen.dll' DiskId='1' Source='dist/Release64/plugins/amd/isa/spvgen.dll' />
+									<File Id='virtualcontextEXE' Name='VirtualContext.exe' DiskId='1' Source='dist/Release64/plugins/amd/isa/VirtualContext.exe' />
+								</Component>
+							</Directory>
+						</Directory>
+					</Directory>
+
 					<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' />
@@ -264,6 +276,8 @@
 
         <ComponentRef Id='LICENSE' />
 
+        <ComponentRef Id='gcn_plugin' />
+
         <ComponentRef Id='renderdocX86Bins' />
 
         <ComponentRef Id='Scintilla' />