diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 697cb475dc1b..d9d7970c751c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10181,6 +10181,15 @@
       fingerprint = "F90F FD6D 585C 2BA1 F13D  E8A9 7571 654C F88E 31C2";
     }];
   };
+  oxapentane = {
+    email = "blame@oxapentane.com";
+    github = "oxapentane";
+    githubId = 1297357;
+    name = "Grigory Shipunov";
+    keys = [{
+      fingerprint = "DD09 98E6 CDF2 9453 7FC6  04F9 91FA 5E5B F9AA 901C";
+    }];
+  };
   oxij = {
     email = "oxij@oxij.org";
     github = "oxij";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index a8e66897a683..35e184b43991 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -110,6 +110,7 @@ with lib.maintainers; {
       astro
       SuperSandro2000
       revol-xut
+      oxapentane
     ];
     scope = "Maintain packages used in the C3D2 hackspace";
     shortName = "c3d2";