diff --git a/windows/src/desktop/history.md b/windows/src/desktop/history.md
index 7a93845e62..bd5f5bf976 100644
--- a/windows/src/desktop/history.md
+++ b/windows/src/desktop/history.md
@@ -2,6 +2,7 @@
 
 ## 13.0 alpha
 * Start version 13.0
+* Add 64-bit version of kmcomp and kmcmpdll for cross-platform support (#2352)
 
 ## 2019-11-15 12.0.54 stable
 * Bug Fix: On Screen Keyboard restored to wrong screen and position when reloading (#2330)
diff --git a/windows/src/developer/kmcmpdll/Makefile b/windows/src/developer/kmcmpdll/Makefile
index b7f5139891..e6ccbf316b 100644
--- a/windows/src/developer/kmcmpdll/Makefile
+++ b/windows/src/developer/kmcmpdll/Makefile
@@ -33,8 +33,8 @@ signcode:
     $(SIGNCODE) /d "Keyman Developer Compiler" $(PROGRAM)\developer\kmcmpdll.x64.dll
 
 backup:
-    $(WZZIP) $(BUILD)\developer\kmcmpdll.zip  $(BACKUPDEFAULTS) kmcmpdll.dll
-
+    $(WZZIP) $(BUILD)\developer\kmcmpdll.zip  $(BACKUPDEFAULTS) $(PROGRAM)\developer\kmcmpdll.dll $(PROGRAM)\developer\kmcmpdll.x64.dll
+ 
 test-manifest:
     @rem This target needed as dependency for TIKE and KMCMPDLL
 
diff --git a/windows/src/developer/kmcomp/Makefile b/windows/src/developer/kmcomp/Makefile
index 7e2a3aaff7..653ed33ccf 100644
--- a/windows/src/developer/kmcomp/Makefile
+++ b/windows/src/developer/kmcomp/Makefile
@@ -36,11 +36,12 @@ signcode:
     $(SIGNCODE) /d "Keyman Developer Command-Line Compiler" $(PROGRAM)\developer\kmcomp.x64.exe
 
 backup:
-    $(WZZIP) $(BUILD)\developer\kmcomp.zip  $(BACKUPDEFAULTS) kmcomp.exe
+    $(WZZIP) $(BUILD)\developer\kmcomp.zip  $(BACKUPDEFAULTS) $(PROGRAM)\developer\kmcomp.exe $(PROGRAM)\developer\kmcomp.x64.exe
 
 test-manifest:
-    # test that (a) linked manifest exists and correct, and (b) has uiAccess=true
+    # test that (a) linked manifest exists and correct
     $(MT) -nologo -inputresource:$(PROGRAM)\developer\kmcomp.exe -validate_manifest
+    $(MT) -nologo -inputresource:$(PROGRAM)\developer\kmcomp.x64.exe -validate_manifest
 
 install:
     $(COPY) $(PROGRAM)\developer\kmcomp.exe "$(INSTALLPATH_KEYMANDEVELOPER)\kmcomp.exe"