diff --git a/windows/src/engine/inst/Makefile b/windows/src/engine/inst/Makefile
index 0be8e7661c..f03af726e3 100644
--- a/windows/src/engine/inst/Makefile
+++ b/windows/src/engine/inst/Makefile
@@ -6,6 +6,8 @@
 
 # ----------------------------------------------------------------------
 
+ENGINE_FILES=keymanengine.wixobj components.wixobj cef.wixobj
+
 setup: msm copy
 
 build:
@@ -35,7 +37,7 @@ msm:
     $(MAKE) -fdownload.mak candle
     
     # warning 1072 relates to Error table defined by WixUtilExtension. Doesn't really affect us.
-    $(WIXLIGHT) -sw1072 -ext WixUtilExtension keymanengine.wixobj components.wixobj -o keymanengine.msm
+    $(WIXLIGHT) -sw1072 -ext WixUtilExtension $(ENGINE_FILES) -o keymanengine.msm
 
 copy:    
     #
@@ -62,6 +64,7 @@ clean:
     -del /Q *.msm
     -del /Q *.wixobj
     -del /Q *.wixpdb
+    -del /Q cef.wxs
 
 install:
     rem nothing
diff --git a/windows/src/engine/inst/download.in b/windows/src/engine/inst/download.in
index c6d7695cb5..6bf70c2d93 100644
--- a/windows/src/engine/inst/download.in
+++ b/windows/src/engine/inst/download.in
@@ -4,6 +4,13 @@
 
 !include ..\..\defines.mak
 
+# It would be good to have a single merge module for CEF but it's not critical
+# as we will end up using the CEF from Keyman Engine in Keyman Developer
+
+# We use different directories so that heat generates
+# different identifiers for the various folders
+KEYMAN_WIX_TEMP_CEF=$(TEMP)\keyman_wix_build\cef
+
 default:
   echo Please don't call this file directly -- used by Makefile
 
@@ -16,6 +23,16 @@ prepareredist:
 
 clean:
   rem
-  
-candle:
+
+heat-cef:
+    # We copy the files to a temp folder in order to exclude .git and README.md from harvesting
+    -rmdir /s/q $(KEYMAN_WIX_TEMP_CEF)
+    mkdir $(KEYMAN_WIX_TEMP_CEF)
+    xcopy $(KEYMAN_CEF4DELPHI_ROOT)\* $(KEYMAN_WIX_TEMP_CEF)\ /s
+    $(WIXHEAT) dir $(KEYMAN_WIX_TEMP_CEF) -o cef.wxs -ag -cg CEF -dr INSTALLDIR -var var.CefSourceDir -wx -nologo
+    # When we candle/light build, we can grab the source files from the proper root so go ahead and delete the temp folder again
+    -rmdir /s/q $(KEYMAN_WIX_TEMP_CEF)
+
+candle: heat-cef
   $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -ext WixUtilExtension keymanengine.wxs components.wxs
+  $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dCefSourceDir=$(KEYMAN_CEF4DELPHI_ROOT) cef.wxs