diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs
index f1d03a4c..6e29d72b 100644
--- a/platforms/Windows/bld/bld.wxs
+++ b/platforms/Windows/bld/bld.wxs
@@ -33,6 +33,15 @@
       <Directory Id="_usr_share_swift" Name="swift" />
     </DirectoryRef>
 
+    <ComponentGroup Id="cmark_gfm" Directory="_usr_bin">
+      <Component>
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin/cmark-gfm.dll" />
+      </Component>
+      <Component>
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin/cmark-gfm-extensions.dll" />
+      </Component>
+    </ComponentGroup>
+
     <ComponentGroup Id="binutils" Directory="_usr_bin">
       <!-- TODO(compnerd) can we use symbolic links to llvm-ar.exe instead? -->
       <Component>
@@ -393,6 +402,8 @@
     </ComponentGroup>
 
     <Feature Id="BuildTools" AllowAbsent="no" Title="!(loc.Bld_ProductName)">
+      <ComponentGroupRef Id="cmark_gfm" />
+
       <ComponentGroupRef Id="binutils" />
       <ComponentGroupRef Id="lto" />
       <ComponentGroupRef Id="clang" />
diff --git a/platforms/Windows/cli/cli.wixproj b/platforms/Windows/cli/cli.wixproj
index 723bdc06..b642f2d0 100644
--- a/platforms/Windows/cli/cli.wixproj
+++ b/platforms/Windows/cli/cli.wixproj
@@ -7,7 +7,6 @@
       SWIFT_DOCC_BUILD=$(SWIFT_DOCC_BUILD);
       INCLUDE_SWIFT_DOCC=$(INCLUDE_SWIFT_DOCC);
       SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD);
-      INCLUDE_SWIFT_FORMAT=$(INCLUDE_SWIFT_FORMAT);
       SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST=$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist;
     </DefineConstants>
   </PropertyGroup>
diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxs
index 714fba10..0d48be14 100644
--- a/platforms/Windows/cli/cli.wxs
+++ b/platforms/Windows/cli/cli.wxs
@@ -239,14 +239,13 @@
       <?endif?>
     </ComponentGroup>
 
-    <ComponentGroup Id="swift_format" Directory="ToolsVersioned">
-      <?if $(INCLUDE_SWIFT_FORMAT) == true ?>
-        <Component Id="swift_format.exe">
-          <File Source="$(SWIFT_FORMAT_BUILD)\swift-format.exe" />
-        </Component>
-
-        <ComponentRef Id="SystemToolsEnvironmentVariables" />
-      <?endif?>
+    <ComponentGroup Id="swift_format" Directory="_usr_bin">
+      <Component>
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-format.exe" />
+      </Component>
+      <Component>
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftFormat.dll" />
+      </Component>
     </ComponentGroup>
 
     <Feature Id="CLITools" AllowAbsent="no" Title="!(loc.Cli_ProductName)">
diff --git a/platforms/Windows/readme.md b/platforms/Windows/readme.md
index 39044ffe..5cd25b4d 100644
--- a/platforms/Windows/readme.md
+++ b/platforms/Windows/readme.md
@@ -106,7 +106,7 @@ MSBuild automatically imports Directory.Build.props files in your tree. We use D
 | ArePackageCabsEmbedded | Always set to false to keep the .cab files external to the .msi files. This save user disk space: Burn caches packages so it can always uninstall and repair. MSI also caches packages for uninstall. If the cab is embedded, you have two copies and MSI doesn't always use its cached copy as a source for repair. With an external .cab, MSI caches only the tiny .msi file and not the (relatively huge) .cab. |
 | BundleFlavor, IsBundleCompressed | BundleFlavor defaults to `online` to build an online bundle. Set by the invocation of MSBuild to build an online or offline bundle. Controls IsBundleCompressed. |
 | DefineConstants | Passes a subset of MSBuild properties into the WiX build as preprocessor variables. |
-| INCLUDE_SWIFT_FORMAT, INCLUDE_SWIFT_INSPECT | swift-format and swift-inspect are currently conditionalized out. Set these to `true` to include them. The properties `SWIFT_FORMAT_BUILD` and `SWIFT_INSPECT_BUILD` define the directories to find the .exes. |
+| INCLUDE_SWIFT_INSPECT | swift-inspect is currently conditionalized out. Set it to `true` to include it. The property `SWIFT_INSPECT_BUILD` defines the directory to find the artifacts. |
 | INCLUDE_X86_SDK, INCLUDE_ARM64_SDK | The x86 and Arm64 SDKs are currently conditionalized out, pending build changes. Set these to `true` to include them in the bundles. Note that bundle\theme.xml currently has commented-out checkboxes that need to be restored when the x86 and Arm64 SDKs are brought back. |