diff --git a/locales/en-US/tools.ftl b/locales/en-US/tools.ftl
index cee977902..0dc08fada 100644
--- a/locales/en-US/tools.ftl
+++ b/locales/en-US/tools.ftl
@@ -60,6 +60,10 @@ tools-install-page-title = Install Rust
 
 install-using-rustup-heading = Using rustup (Recommended)
 
+install-rustup32-button = Download <span class="nowrap">rustup-init.exe</span> <span class="nowrap">(32-bit)</span>
+
+install-rustup64-button = Download <span class="nowrap">rustup-init.exe</span> <span class="nowrap">(64-bit)</span>
+
 install-notes-heading = Notes about Rust installation
 
 install-notes-getting-started-description = If you're just getting started with
@@ -149,8 +153,8 @@ install-other-methods-link = Learn more
 
 ## components/tools/rustup.hbs
 
-tools-rustup-unixy = It looks like you’re running macOS, Linux, or another Unix-like OS. To download Rustup and install Rust, run the following in your terminal, then follow the on-screen instructions.
-tools-rustup-windows = It looks like you’re running Windows. To install Rust, download and run the following, and then follow the onscreen instructions.
+tools-rustup-unixy = It looks like you’re running macOS, Linux, or another Unix-like OS. To download Rustup and install Rust, run the following in your terminal, then follow the on-screen instructions. See <a href="https://forge.rust-lang.org/infra/other-installation-methods.html">"Other Installation Methods"</a> if you are on Windows.
+tools-rustup-windows = It looks like you’re running Windows. To start using Rust, download the installer, then run the program and follow the onscreen instructions. See <a href="https://forge.rust-lang.org/infra/other-installation-methods.html">"Other Installation Methods"</a> if you are not on Windows.
 tools-rustup-wsl-heading = Windows Subsystem for Linux
 tools-rustup-wsl = If you’re a Windows Subsystem for Linux user run the following in your terminal, then follow the on-screen instructions to install Rust.
 tools-rustup-unknown = Rust runs on Windows, Linux, macOS, FreeBSD and NetBSD. If you are on one of these platforms and are seeing this then please report an issue with the following values:
diff --git a/templates/components/tools/rustup.hbs b/templates/components/tools/rustup.hbs
index e6f50b025..a55a3f37b 100644
--- a/templates/components/tools/rustup.hbs
+++ b/templates/components/tools/rustup.hbs
@@ -5,10 +5,19 @@
   </div>
   <div id="platform-instructions-win" class="instructions dn">
     <p>{{fluent "tools-rustup-windows"}}</p>
-    <a href="https://win.rustup.rs" class="button button-secondary">rustup‑init.exe</a>
-    <p><b>{{fluent "tools-rustup-wsl-heading"}}</b></p>
-    <p>{{fluent "tools-rustup-wsl"}}</p>
-    <pre><code class="db w-100">curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh</code></pre>
+    <div class="mw9 center ph3-ns">
+    <div class="cf ph2-ns">
+      <div class="fl w-100 w-50-ns pa2">
+      <a href="https://static.rust-lang.org/rustup/dist/i686-pc-windows-msvc/rustup-init.exe" class="button button-secondary">{{fluent "install-rustup32-button"}}</a>
+      </div>
+      <div class="fl w-100 w-50-ns pa2">
+      <a href="https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe" class="button button-secondary">{{fluent "install-rustup64-button"}}</a>
+      </div>
+    </div>
+  </div>
+  <h3 class="mt4">{{fluent "tools-rustup-wsl-heading"}}</h3>
+  <p>{{fluent "tools-rustup-wsl"}}</p>
+  <pre><code class="db w-100">curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh</code></pre>
   </div>
   <div id="platform-instructions-unknown" class="instructions dn">
     <!-- unrecognized platform: ask for help -->