diff --git a/cmd/buildctl/debug.go b/cmd/buildctl/debug.go
new file mode 100644
index 00000000..6144f3e3
--- /dev/null
+++ b/cmd/buildctl/debug.go
@@ -0,0 +1,14 @@
+package main
+
+import (
+	"github.com/tonistiigi/buildkit_poc/cmd/buildctl/debug"
+	"github.com/urfave/cli"
+)
+
+var debugCommand = cli.Command{
+	Name:  "debug",
+	Usage: "debug utilities",
+	Subcommands: []cli.Command{
+		debug.DumpCommand,
+	},
+}
diff --git a/cmd/buildctl/dump.go b/cmd/buildctl/debug/dump.go
similarity index 95%
rename from cmd/buildctl/dump.go
rename to cmd/buildctl/debug/dump.go
index ba8ef28c..04081367 100644
--- a/cmd/buildctl/dump.go
+++ b/cmd/buildctl/debug/dump.go
@@ -1,4 +1,4 @@
-package main
+package debug
 
 import (
 	"io"
@@ -13,7 +13,7 @@ import (
 	"github.com/urfave/cli"
 )
 
-var dumpCommand = cli.Command{
+var DumpCommand = cli.Command{
 	Name:   "dump",
 	Usage:  "dump LLB in human-readable format. LLB must be passed via stdin. This command does not require the daemon to be running.",
 	Action: dumpLLB,
diff --git a/cmd/buildctl/main.go b/cmd/buildctl/main.go
index 221765a6..dc0486f1 100644
--- a/cmd/buildctl/main.go
+++ b/cmd/buildctl/main.go
@@ -29,7 +29,7 @@ func main() {
 	app.Commands = []cli.Command{
 		diskUsageCommand,
 		buildCommand,
-		dumpCommand,
+		debugCommand,
 	}
 
 	app.Before = func(context *cli.Context) error {