diff --git a/build-tools/bundle/bundle-path.targets b/build-tools/bundle/bundle-path.targets
index bf25b44545f..0722ba1c016 100644
--- a/build-tools/bundle/bundle-path.targets
+++ b/build-tools/bundle/bundle-path.targets
@@ -24,6 +24,7 @@
     <!-- Files which contribute to the bundle "version" -->
     <ItemGroup>
       <VersionFile Include="..\mono-runtimes\mono-runtimes.*" />
+      <VersionFile Include="..\scripts\BuildEverything.mk" />
     </ItemGroup>
     <HashFileContents
         Files="@(VersionFile)">
diff --git a/build-tools/scripts/BuildEverything.mk b/build-tools/scripts/BuildEverything.mk
index 11ddc146a86..0b8b038c3e5 100644
--- a/build-tools/scripts/BuildEverything.mk
+++ b/build-tools/scripts/BuildEverything.mk
@@ -58,6 +58,11 @@ ifneq ($(OS),Linux)
 ALL_HOST_ABIS += \
 	mxe-Win32 \
 	mxe-Win64
+else
+ALL_HOST_ABIS += \
+	linux-Win32 \
+	linux-Win64
+endif
 
 ALL_AOT_ABIS += \
 	win-armeabi \
@@ -65,6 +70,7 @@ ALL_AOT_ABIS += \
 	win-x86 \
 	win-x86_64
 
+ifneq ($(OS),Linux)
 MONO_OPTIONS += --arch=64
 endif