diff --git a/cabal-install/src/Distribution/Client/Setup.hs b/cabal-install/src/Distribution/Client/Setup.hs
index 46be79ce605deae68c3746f0f220ce8f370fb780..e509b99ce2fcae8142dc44a9bfca694efc3c4283 100644
--- a/cabal-install/src/Distribution/Client/Setup.hs
+++ b/cabal-install/src/Distribution/Client/Setup.hs
@@ -238,41 +238,49 @@ globalCommand commands = CommandUI {
          "Commands:\n"
       ++ unlines (
         [ startGroup "global"
-        , addCmd "update"
-        , addCmd "install"
-        , par
+        , addCmd "user-config"
         , addCmd "help"
-        , addCmd "info"
+        , par
+        , startGroup "package database"
+        , addCmd "update"
         , addCmd "list"
-        , addCmd "fetch"
-        , addCmd "user-config"
+        , addCmd "info"
         , par
-        , startGroup "package"
-        , addCmd "get"
-        , addCmd "unpack"
+        , startGroup "initialization and download"
         , addCmd "init"
+        , addCmd "fetch"
+        , addCmd "get"
         , par
+        , startGroup "project configuration"
         , addCmd "configure"
+        , addCmd "freeze"
+        , addCmd "gen-bounds"
+        , addCmd "outdated"
+        , par
+        , startGroup "project building and installing"
         , addCmd "build"
+        , addCmd "install"
+        , addCmd "haddock"
+        , addCmd "haddock-project"
         , addCmd "clean"
         , par
-        , addCmd "run"
+        , startGroup "running and testing"
+        , addCmd "list-bin"
         , addCmd "repl"
-        , addCmd "test"
+        , addCmd "run"
         , addCmd "bench"
+        , addCmd "test"
+        , addCmd "exec"
         , par
+        , startGroup "sanity checks and shipping"
         , addCmd "check"
         , addCmd "sdist"
         , addCmd "upload"
         , addCmd "report"
         , par
-        , addCmd "freeze"
-        , addCmd "gen-bounds"
-        , addCmd "outdated"
-        , addCmd "haddock"
+        , startGroup "deprecated"
+        , addCmd "unpack"
         , addCmd "hscolour"
-        , addCmd "exec"
-        , addCmd "list-bin"
         , par
         , startGroup "new-style projects (forwards-compatible aliases)"
         , addCmd "v2-build"
@@ -298,12 +306,8 @@ globalCommand commands = CommandUI {
         , addCmd "v1-bench"
         , addCmd "v1-freeze"
         , addCmd "v1-haddock"
-        , addCmd "v1-exec"
-        , addCmd "v1-update"
         , addCmd "v1-install"
         , addCmd "v1-clean"
-        , addCmd "v1-sdist"
-        , addCmd "v1-doctest"
         , addCmd "v1-copy"
         , addCmd "v1-register"
         , addCmd "v1-reconfigure"