diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props
index 382ce242..6e892f80 100644
--- a/platforms/Windows/Directory.Build.props
+++ b/platforms/Windows/Directory.Build.props
@@ -28,6 +28,12 @@
   <PropertyGroup Condition=" '$(IncludeLegacySDK)' == '' ">
     <IncludeLegacySDK>true</IncludeLegacySDK>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(IncludeLLVMDLL)' == '' ">
+    <IncludeLLVMDLL>false</IncludeLLVMDLL>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(LLVMVersion)' == '' ">
+    <LLVMVersion>21</LLVMVersion>
+  </PropertyGroup>
 
   <PropertyGroup>
     <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)build\))</RootBuildFolder>
@@ -92,6 +98,8 @@
       WindowsExperimentalRuntimeX64=$(WindowsExperimentalRuntimeX64);
       WindowsExperimentalRuntimeX86=$(WindowsExperimentalRuntimeX86);
       IncludeLegacySDK=$(IncludeLegacySDK);
+      IncludeLLVMDLL=$(IncludeLLVMDLL);
+      LLVMVersion=$(LLVMVersion);
     </DefineConstants>
   </PropertyGroup>
 
diff --git a/platforms/Windows/bld/bld.wxi b/platforms/Windows/bld/bld.wxi
index 3c4ecbf2..6253bfc6 100644
--- a/platforms/Windows/bld/bld.wxi
+++ b/platforms/Windows/bld/bld.wxi
@@ -193,6 +193,14 @@
       -->
     </ComponentGroup>
 
+    <?if $(IncludeLLVMDLL) = True?>
+    <ComponentGroup Id="llvm" Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
+        <File Source="$(ToolchainRoot)\usr\bin\LLVM-$(LLVMVersion).dll" />
+      </Component>
+    </ComponentGroup>
+    <?endif?>
+
     <ComponentGroup Id="lld" Directory="toolchain_$(VariantName)_usr_bin">
       <!-- TODO(compnerd) can we use symbolic links to lld.exe instead? -->
       <Component>
@@ -560,6 +568,9 @@
       <ComponentGroupRef Id="binutils" />
       <ComponentGroupRef Id="lto" />
       <ComponentGroupRef Id="clang" />
+      <?if $(IncludeLLVMDLL) = True?>
+      <ComponentGroupRef Id="llvm" />
+      <?endif?>
       <ComponentGroupRef Id="lld" />
       <ComponentGroupRef Id="BlocksRuntime" />
       <ComponentGroupRef Id="libdispatch" />