diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 2ab568ba8416..12b57cb82dfd 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoPackage rec {
   name = "shfmt-${version}";
-  version = "1.1.0";
-  rev = "v${version}";
+  version = "2.6.4";
 
-  goPackagePath = "github.com/mvdan/sh";
+  goPackagePath = "mvdan.cc/sh";
+  subPackages = ["cmd/shfmt"];
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "sh";
-    inherit rev;
-    sha256 = "0h1qy27z6j1cgkk3hkvl7w3wjqc5flgn92r3j6frn8k2wzwj7zhz";
+    rev = "v${version}";
+    sha256 = "1jifac0fi0sz6wzdgvk6s9xwpkdng2hj63ldbaral8n2j9km17hh";
   };
 
   meta = with stdenv.lib; {