diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 8cf9f04..52059bf 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           target: armv7a-none-eabi
-          toolchain: 1.42.0
+          toolchain: 1.46.0
           override: true
 
       - name: Install build dependencies
@@ -43,7 +43,7 @@ jobs:
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.42.0
+          toolchain: 1.46.0
           override: true
 
       - name: Install build dependencies
@@ -151,7 +151,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           target: armv7a-none-eabi
-          toolchain: 1.42.0
+          toolchain: 1.46.0
           override: true
 
       - name: Cache cargo registry
@@ -185,9 +185,9 @@ jobs:
       #     which flip-lld || cargo install `cat dev-dependencies.txt`
 
       # TODO cache in dev-dependencies.txt when available on crates.io
-      - name: Install flip-lld
+      - name: Install flip-link
         run: |
-          cargo install --git https://github.com/japaric/flip-lld --rev b1028b9b140150379ecdcea2c07580af933378e9
+          cargo install --git https://github.com/knurling-rs/flip-link --branch main
 
       - name: Install build dependencies
         run: |
@@ -237,7 +237,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           target: armv7a-none-eabi
-          toolchain: 1.42.0
+          toolchain: 1.46.0
           override: true
 
       - name: Install clippy
diff --git a/firmware/.cargo/config b/firmware/.cargo/config
index 86bc8a4..90c2eed 100644
--- a/firmware/.cargo/config
+++ b/firmware/.cargo/config
@@ -10,13 +10,13 @@
 runner = "usd-runner"
 
 rustflags = [
-  "-C", "linker=flip-lld",
+  "-C", "linker=flip-link",
   "-C", "link-arg=-Tlink.x",
 ]
 
 [target.armv7a-none-eabihf]
 rustflags = [
-  "-C", "linker=flip-lld",
+  "-C", "linker=flip-link",
   "-C", "link-arg=-Tlink.x",
 ]
 
diff --git a/firmware/usbarmory/README.md b/firmware/usbarmory/README.md
index 8b140c9..0246864 100644
--- a/firmware/usbarmory/README.md
+++ b/firmware/usbarmory/README.md
@@ -23,8 +23,8 @@ stage and will not be ready to use for some time.
 
 ## Build dependencies
 
-- [flip-lld], linker wrapper that adds zero-cost stack overflow protection.
-  `cargo install --git https://github.com/japaric/flip-lld`.
+- [flip-link], linker wrapper that adds zero-cost stack overflow protection.
+  `cargo install --git https://github.com/knurling-rs/flip-link --branch main`.
 
 - `armv7a-none-eabi` compiler support. Install with `rustup target add
   armv7a-none-eabi`.
@@ -537,7 +537,7 @@ without any additional terms or conditions.
 
 [usbarmory]: https://github.com/f-secure-foundry/usbarmory/wiki
 [F-Secure]: https://foundry.f-secure.com/
-[flip-lld]: https://github.com/japaric/flip-lld
+[flip-link]: https://github.com/knurling-rs/flip-link
 [CONTRIBUTING.md]: https://github.com/iqlusioninc/usbarmory.rs/blob/develop/CONTRIBUTING.md
 [CODE_OF_CONDUCT.md]: https://github.com/iqlusioninc/usbarmory.rs/blob/develop/CODE_OF_CONDUCT.md
 [Apache License, Version 2.0]: https://www.apache.org/licenses/LICENSE-2.0