diff --git a/LOG b/LOG
index 911b21e6c7..f7f831ea71 100644
--- a/LOG
+++ b/LOG
@@ -933,3 +933,5 @@
     mats/Mf-t*, foreign.ms, foreign4.c
 - Don't install equates.h
     Mf-install.in, wininstall/*nt.wxs
+- Windows install now sets HeapSearchPath in the registry
+    wininstall/product.wxs
diff --git a/wininstall/product.wxs b/wininstall/product.wxs
index d3d4ab7ed0..822ba562e6 100755
--- a/wininstall/product.wxs
+++ b/wininstall/product.wxs
@@ -76,6 +76,14 @@
       <FeatureRef Id="VCRedist64"/>
     <?endif?>
 
+    <Feature Id="Registry" Level="1" Title="Chez Scheme Registry Entries">
+      <Component Id="cmpRegistry" Directory="APPLICATIONFOLDER" Guid="*">
+        <RegistryKey Root="HKLM" Key="SOFTWARE\Chez Scheme\csv$(var.Version)">
+          <RegistryValue Name="HeapSearchPath" Value="[D_boot]%m" Type="string" />
+        </RegistryKey>
+      </Component>
+    </Feature>
+
     <Icon Id="cs.ico" SourceFile="../c/cs.ico"/>
     <Property Id="ARPPRODUCTICON" Value="cs.ico"/>