diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e45831300c00..5431ce9a489d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2028,6 +2028,13 @@
     github = "Atry";
     githubId = 601530;
   };
+  attila = {
+    name = "Attila Oláh";
+    email = "attila@dorn.haus";
+    github = "attilaolah";
+    githubId = 196617;
+    keys = [ { fingerprint = "BF2E 4759 74D3 88E0 E30C  9604 07E6 C064 3FD1 42C3"; } ];
+  };
   auchter = {
     name = "Michael Auchter";
     email = "a@phire.org";
diff --git a/pkgs/by-name/bi/bitbucket-cli/package.nix b/pkgs/by-name/bi/bitbucket-cli/package.nix
new file mode 100644
index 000000000000..f5927ec44de5
--- /dev/null
+++ b/pkgs/by-name/bi/bitbucket-cli/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule rec {
+  pname = "bitbucket-cli";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "swisscom";
+    repo = "bitbucket-cli";
+    rev = "v${version}";
+    hash = "sha256-8Qvlv/S5IkRk+2D/Pnb0+FP7ryHh1kSRJCiUjSO0OtI=";
+  };
+
+  vendorHash = "sha256-xjCY3Ycz5Ty6jTDHNNUWYp2SP8EPhDiwO7+WJBL3lAQ=";
+
+  # Tests seem to be using Swisscom's live servers.
+  doCheck = false;
+
+  meta = {
+    description = "Bitbucket Enterprise CLI";
+    homepage = "https://github.com/swisscom/bitbucket-cli";
+    mainProgram = "bitbucket-cli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ attila ];
+    platforms = with lib.platforms; linux ++ darwin;
+  };
+}