diff --git a/browser_patches/buildbots/bots.md b/browser_patches/buildbots/bots.md
index 2b0eea2f05..09783c0a40 100644
--- a/browser_patches/buildbots/bots.md
+++ b/browser_patches/buildbots/bots.md
@@ -4,16 +4,16 @@ This document describes setting up bots infrastructure to produce
 browser builds.
 
 We currently have 4 build bots that produce 6 builds
-- **[bot-linux]** Ubuntu 18.04 machine
+- **[buildbot-linux]** Ubuntu 18.04 machine
     - builds: `Webkit-Linux`, `Firefox-Linux`
-- **[bot-mac-10.14]** Mac 10.14 machine
+- **[buildbot-mac-10.14]** Mac 10.14 machine
     - builds: `WebKit-mac-10.14`, `Firefox-Mac`
-- **[bot-mac-10.15]** machine
+- **[buildbot-mac-10.15]** machine
     - builds: `WebKit-mac-10.15`
-- **[bot-windows]** Windows machine
-    - builds: `Firefox-win32`
+- **[buildbot-windows]** Windows 10 machine
+    - builds: `Firefox-win32`, `Firefox-win64`
 
-# bot-windows
+# buildbot-windows
 
 ## Setting Up Host Machine
 
diff --git a/browser_patches/buildbots/buildbot-windows.sh b/browser_patches/buildbots/buildbot-windows.sh
index 4cfc6e727b..4a417cba7a 100755
--- a/browser_patches/buildbots/buildbot-windows.sh
+++ b/browser_patches/buildbots/buildbot-windows.sh
@@ -36,6 +36,8 @@ while true; do
   echo "== ITERATION ${iteration} =="
   git pull origin master
   ../checkout_build_archive_upload.sh firefox
+  git pull origin master
+  ../checkout_build_archive_upload.sh firefox --win64
   echo "------ Sleeping for 300 seconds before next turn... ------"
   sleep 300
 done;
diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh
index 577840ca62..736ad190ef 100755
--- a/browser_patches/checkout_build_archive_upload.sh
+++ b/browser_patches/checkout_build_archive_upload.sh
@@ -21,8 +21,12 @@ if [[ $# == 0 ]]; then
 fi
 
 BROWSER_NAME=""
+FFOX_WIN64=""
 if [[ ("$1" == "firefox") || ("$1" == "firefox/") ]]; then
   BROWSER_NAME="firefox"
+  if [[ ("$2" == "--win64") || ("$3" == "--win64") ]]; then
+    FFOX_WIN64="--win64"
+  fi
 elif [[ ("$1" == "webkit") || ("$1" == "webkit/") ]]; then
   BROWSER_NAME="webkit"
 else
@@ -58,11 +62,19 @@ fi
 
 echo "-- preparing checkout"
 ./prepare_checkout.sh $BROWSER_NAME
+
 echo "-- cleaning"
 ./$BROWSER_NAME/clean.sh
+
 echo "-- building"
-./$BROWSER_NAME/build.sh
+if [[ $BROWSER_NAME == "firefox" ]]; then
+  ./$BROWSER_NAME/build.sh $FFOX_WIN64
+else
+  ./$BROWSER_NAME/build.sh
+fi
+
 echo "-- archiving to $ZIP_PATH"
 ./$BROWSER_NAME/archive.sh $ZIP_PATH
+
 echo "-- uploading"
 ./upload.sh $BROWSER_NAME $ZIP_PATH
diff --git a/browser_patches/firefox/build.sh b/browser_patches/firefox/build.sh
index 7396ab5bb2..a5aa57a609 100755
--- a/browser_patches/firefox/build.sh
+++ b/browser_patches/firefox/build.sh
@@ -33,7 +33,13 @@ if [[ "$(uname)" == "Darwin" ]]; then
 elif [[ "$(uname)" == "Linux" ]]; then
   echo "-- building on Linux"
 elif [[ "$(uname)" == MINGW* ]]; then
-  echo "-- building on MINGW"
+  if [[ $1 == "--win64" ]]; then
+    echo "-- building win64 build on MINGW"
+    echo "ac_add_options --target=x86_64-pc-mingw32" > .mozconfig
+    echo "ac_add_options --host=x86_64-pc-mingw32" >> .mozconfig
+  else
+    echo "-- building win32 build on MINGW"
+  fi
 else
   echo "ERROR: cannot upload on this platform!" 1>&2
   exit 1;
diff --git a/browser_patches/tools/check_cdn.sh b/browser_patches/tools/check_cdn.sh
index 2acc62f7ab..c6fcbb7e60 100755
--- a/browser_patches/tools/check_cdn.sh
+++ b/browser_patches/tools/check_cdn.sh
@@ -16,6 +16,7 @@ ARCHIVES=(
   "$HOST/firefox/%s/firefox-mac.zip"
   "$HOST/firefox/%s/firefox-linux.zip"
   "$HOST/firefox/%s/firefox-win32.zip"
+  "$HOST/firefox/%s/firefox-win64.zip"
   "$HOST/webkit/%s/minibrowser-linux.zip"
   "$HOST/webkit/%s/minibrowser-mac-10.14.zip"
   "$HOST/webkit/%s/minibrowser-mac-10.15.zip"
@@ -24,7 +25,8 @@ ARCHIVES=(
 ALIASES=(
   "FF-MAC"
   "FF-LINUX"
-  "FF-WIN"
+  "FF-WIN32"
+  "FF-WIN64"
   "WK-LINUX"
   "WK-MAC-10.14"
   "WK-MAC-10.15"
diff --git a/browser_patches/upload.sh b/browser_patches/upload.sh
index ee164a14ba..fbe4df08ef 100755
--- a/browser_patches/upload.sh
+++ b/browser_patches/upload.sh
@@ -6,7 +6,7 @@ trap "cd $(pwd -P)" EXIT
 cd "$(dirname "$0")"
 
 if [[ ($1 == '--help') || ($1 == '-h') ]]; then
-  echo "usage: $(basename $0) [firefox|webkit] [--check] [zip-path]"
+  echo "usage: $(basename $0) [firefox|webkit] [--check] [zip-path] [--win64]"
   echo
   echo "Upload .zip as a browser build."
   echo
@@ -43,7 +43,11 @@ if [[ ("$1" == "firefox") || ("$1" == "firefox/") ]]; then
   elif [[ "$(uname)" == "Linux" ]]; then
     BLOB_NAME="firefox-linux.zip"
   elif [[ "$(uname)" == MINGW* ]]; then
-    BLOB_NAME="firefox-win32.zip"
+    if [[ ("$2" == "--win64") || ("$3" == "--win64") ]]; then
+      BLOB_NAME="firefox-win64.zip"
+    else
+      BLOB_NAME="firefox-win32.zip"
+    fi
   else
     echo "ERROR: unzupported platform - $(uname)"
     exit 1