diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix
index b3da0f7d734f..cfe1c570c765 100644
--- a/pkgs/tools/misc/upterm/default.nix
+++ b/pkgs/tools/misc/upterm/default.nix
@@ -7,22 +7,24 @@
 
 buildGoModule rec {
   pname = "upterm";
-  version = "0.8.2";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "owenthereal";
     repo = "upterm";
     rev = "v${version}";
-    hash = "sha256-JcUFsj7+Hu++izyxozttyxTGW51vBfgNSvAa/AIrsvs=";
+    hash = "sha256-ywwqX4aw9vc2kptYZisArTpdz7Cf49Z0jMdP90KXejs=";
   };
 
   vendorSha256 = null;
 
+  subPackages = [ "cmd/upterm" "cmd/uptermd" ];
+
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
-    $out/bin/gendoc
-    rm $out/bin/gendoc
+    # force go to build for build arch rather than host arch during cross-compiling
+    CGO_ENABLED=0 GOOS= GOARCH= go run cmd/gendoc/main.go
     installManPage etc/man/man*/*
     installShellCompletion --bash --name upterm.bash etc/completion/upterm.bash_completion.sh
     installShellCompletion --zsh --name _upterm etc/completion/upterm.zsh_completion