diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe8b6b20dd04..1b1351700f57 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11718,6 +11718,12 @@
     name = "Johan Larsson";
     keys = [ { fingerprint = "F0D6 BDE7 C7D1 6B3F 7883  73E7 2A41 C0FE DD6F F540"; } ];
   };
+  jolheiser = {
+    email = "nixpkgs@jolheiser.com";
+    github = "jolheiser";
+    githubId = 42128690;
+    name = "John Olheiser";
+  };
   jonaenz = {
     name = "Jona Enzinger";
     email = "5xt3zyy5l@mozmail.com";
diff --git a/pkgs/by-name/gi/git-pr/package.nix b/pkgs/by-name/gi/git-pr/package.nix
index eb7b97817832..2edcddc5acf8 100644
--- a/pkgs/by-name/gi/git-pr/package.nix
+++ b/pkgs/by-name/gi/git-pr/package.nix
@@ -6,26 +6,42 @@
 
 buildGoModule rec {
   pname = "git-pr";
-  version = "0.0.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "picosh";
     repo = "git-pr";
     rev = "v${version}";
-    hash = "sha256-7Ka8p5X8nQBXKiT6QsWOWMQJL8rePKrHz/LZU1W+oQ8=";
+    hash = "sha256-2A2rP7yr8faVoIYAWprr+t7MwDPerhsuOjWWEl1mhXw=";
   };
 
-  vendorHash = "sha256-tu5C7hz6UTgn/jCCotXzZHlUmGVNERhA7Osxi31Domk=";
+  vendorHash = "sha256-7aHr5CWZVmhBiuCXaK49zYJXMufCxZBnS917mF0QJlg=";
+
+  subPackages = [
+    "cmd/ssh"
+    "cmd/web"
+  ];
+
+  env.CGO_ENABLED = 0;
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
 
   postInstall = ''
     mv $out/bin/ssh $out/bin/git-ssh
+    mv $out/bin/web $out/bin/git-web
   '';
 
   meta = {
     homepage = "https://pr.pico.sh";
     description = "Simple git collaboration tool";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ sigmanificient ];
-    mainProgram = "git-pr";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      sigmanificient
+      jolheiser
+    ];
+    mainProgram = "git-ssh";
   };
 }