diff --git a/platforms/Windows/toolchain-amd64.wxs b/platforms/Windows/toolchain-amd64.wxs
index e439ebaa..56602373 100644
--- a/platforms/Windows/toolchain-amd64.wxs
+++ b/platforms/Windows/toolchain-amd64.wxs
@@ -82,6 +82,8 @@
                     </Directory>
                   </Directory>
                   <Directory Id="_usr_lib_swift" Name="swift">
+                    <Directory Id="_usr_lib_swift_clang" Name="clang">
+                    </Directory>
                     <Directory Id="_usr_lib_swift_migrator" Name="migrator">
                     </Directory>
                     <Directory Id="_usr_lib_swift_shims" Name="shims">
diff --git a/platforms/Windows/toolchain-arm64.wxs b/platforms/Windows/toolchain-arm64.wxs
index 80100868..2ab0622f 100644
--- a/platforms/Windows/toolchain-arm64.wxs
+++ b/platforms/Windows/toolchain-arm64.wxs
@@ -82,6 +82,8 @@
                     </Directory>
                   </Directory>
                   <Directory Id="_usr_lib_swift" Name="swift">
+                    <Directory Id="_usr_lib_swift_clang" Name="clang">
+                    </Directory>
                     <Directory Id="_usr_lib_swift_migrator" Name="migrator">
                     </Directory>
                     <Directory Id="_usr_lib_swift_shims" Name="shims">
diff --git a/platforms/Windows/toolchain.wixproj b/platforms/Windows/toolchain.wixproj
index b742f9f8..7bb7e89c 100644
--- a/platforms/Windows/toolchain.wixproj
+++ b/platforms/Windows/toolchain.wixproj
@@ -28,7 +28,7 @@
   </Target>
 
   <PropertyGroup>
-    <DefineConstants>ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;$(INCLUDE_DEBUG_INFO)</DefineConstants>
+    <DefineConstants>ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;$(INCLUDE_DEBUG_INFO)</DefineConstants>
     <HarvestDirectoryAutogenerateGuids>false</HarvestDirectoryAutogenerateGuids>
     <HarvestDirectoryGenerateGuidsNow>true</HarvestDirectoryGenerateGuidsNow>
     <HarvestDirectoryNoLogo>true</HarvestDirectoryNoLogo>
@@ -51,6 +51,11 @@
         <DirectoryRefId>_usr_lib_clang</DirectoryRefId>
         <PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_CLANG</PreprocessorVariable>
       </HarvestDirectory>
+      <HarvestDirectory Include="$(TOOLCHAIN_ROOT)\usr\lib\swift\clang">
+        <ComponentGroupName>ClangResourcesForSwift</ComponentGroupName>
+        <DirectoryRefId>_usr_lib_swift_clang</DirectoryRefId>
+        <PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG</PreprocessorVariable>
+      </HarvestDirectory>
     </ItemGroup>
   </Target>