diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c8a054597e5a..205d21a6dfd9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7677,6 +7677,12 @@
     githubId = 1621335;
     name = "Andrew Trachenko";
   };
+  gordon-bp = {
+    email = "gordy@hanakano.com";
+    github = "Gordon-BP";
+    githubId = 77560236;
+    name = "Gordon Clark";
+  };
   gotcha = {
     email = "gotcha@bubblenet.be";
     github = "gotcha";
diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
index a1f495cd2f9e..f81e61ea2ec9 100644
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -60,6 +60,22 @@
     meta.maintainers = with lib.maintainers; [ obreitwi ];
   };
 
+  ssh = mkAzExtension rec {
+    pname = "ssh";
+    version = "2.0.5";
+    url = "https://azcliprod.blob.core.windows.net/cli-extensions/ssh-${version}-py3-none-any.whl";
+    sha256 = "80c98b10d7bf1ce4005b7694aedd05c47355456775ba6125308be65fb0fefc93";
+    description = "SSH into Azure VMs using RBAC and AAD OpenSSH Certificates";
+    propagatedBuildInputs = (
+      with python3Packages;
+      [
+        oras
+        oschmod
+      ]
+    );
+    meta.maintainers = with lib.maintainers; [ gordon-bp ];
+  };
+
   storage-preview = mkAzExtension rec {
     pname = "storage-preview";
     version = "1.0.0b2";
diff --git a/pkgs/development/python-modules/oschmod/default.nix b/pkgs/development/python-modules/oschmod/default.nix
new file mode 100644
index 000000000000..18a30b5c31aa
--- /dev/null
+++ b/pkgs/development/python-modules/oschmod/default.nix
@@ -0,0 +1,25 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "oschmod";
+  version = "0.3.12";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-vsmSFvMWFe5lOypch8rPtOS2GEwOn3HaGGMA2srpdPM=";
+  };
+  build-system = [ setuptools ];
+
+  meta = {
+    description = "Change file permissions on Windows, macOS, and Linux";
+    homepage = "https://github.com/yakdriver/oschmod";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ gordon-bp ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d4af7f217fb..6b61d467f8e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9697,6 +9697,8 @@ self: super: with self; {
 
   osc-sdk-python = callPackage ../development/python-modules/osc-sdk-python { };
 
+  oschmod = callPackage ../development/python-modules/oschmod { };
+
   oscpy = callPackage ../development/python-modules/oscpy { };
 
   oscrypto = callPackage ../development/python-modules/oscrypto { };