diff --git a/hosts/riscbert/default.nix b/hosts/riscbert/default.nix
index e507ee1a..ad6855bd 100644
--- a/hosts/riscbert/default.nix
+++ b/hosts/riscbert/default.nix
@@ -44,8 +44,17 @@
     daemonCPUSchedPolicy = "idle";
     daemonIOSchedClass = "idle";
   };
-  nixpkgs.config.packageOverrides = pkgs:
-    lib.genAttrs [ "openssh" ] (p: pkgs.${p}.overrideAttrs (oa: { doCheck = false; }));
+  nixpkgs.config.packageOverrides = pkgs: {
+    # TODO: https://github.com/NixOS/nixpkgs/pull/189932
+    klibc = pkgs.klibc.overrideAttrs (oa: {
+      makeFlags = map (s:
+        if s == "KLIBCARCH=riscv"
+        then "KLIBCARCH=riscv64"
+        else s
+      ) oa.makeFlags;
+    });
+  } //
+  lib.genAttrs [ "openssh" ] (p: pkgs.${p}.overrideAttrs (oa: { doCheck = false; }));
 
   system.stateVersion = "22.05";