diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix
new file mode 100644
index 00000000000..29b07fbfd0f
--- /dev/null
+++ b/pkgs/development/tools/buildkit/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  pname = "buildkit";
+  version = "0.4.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/moby/buildkit";
+  subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ];
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "moby";
+    repo = "buildkit";
+    sha256 = "0gkwcjqbcskn63y79jwa26hxkps452z4bgz8lrryaskzbdpvhh3d";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";
+    homepage = https://github.com/moby/buildkit;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ vdemeester ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf8e64f3800..9c731baa090 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1202,6 +1202,8 @@ in
 
   buildah = callPackage ../development/tools/buildah { };
 
+  buildkit = callPackage ../development/tools/buildkit { };
+
   bukubrow = callPackage ../tools/networking/bukubrow { };
 
   burpsuite = callPackage ../tools/networking/burpsuite {};