diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8407c37f5593..d2f8aa0900da 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1166,6 +1166,12 @@
     githubId = 2335822;
     name = "Alexandre Esteves";
   };
+  alexnabokikh = {
+    email = "nabokikh@duck.com";
+    github = "alexnabokikh";
+    githubId = 42908293;
+    name = "Alex Nabokikh";
+  };
   alexnortung = {
     name = "alexnortung";
     email = "alex_nortung@live.dk";
diff --git a/pkgs/by-name/tf/tfsort/package.nix b/pkgs/by-name/tf/tfsort/package.nix
new file mode 100644
index 000000000000..f3d1477765e2
--- /dev/null
+++ b/pkgs/by-name/tf/tfsort/package.nix
@@ -0,0 +1,40 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+}:
+buildGoModule (finalAttrs: {
+  pname = "tfsort";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "AlexNabokikh";
+    repo = "tfsort";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UlI1/xcj/xlAgZPiqI9FiJL7JqjP/J00xQZvzXktbxc=";
+  };
+
+  vendorHash = "sha256-H3sdwIKJcOfExYKRafLaBMTyUArc7jTpoW5zynJLtAY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=v${finalAttrs.version}"
+    "-X main.commit=${finalAttrs.version}"
+    "-X main.date=1970-01-01"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/AlexNabokikh/tfsort/releases/tag/v${finalAttrs.version}";
+    description = "Utility to sort Terraform variables, outputs, locals and terraform blocks";
+    homepage = "https://github.com/AlexNabokikh/tfsort";
+    license = lib.licenses.asl20;
+    mainProgram = "tfsort";
+    maintainers = [
+      lib.maintainers.alexnabokikh
+    ];
+  };
+})