diff --git a/requirements-swh.txt b/requirements-swh.txt
index 51a00670ac248417e18705f4adecf5c935bb2ea3..7d8c1a3d3fcfcf791dfb33f70112eac458e9c765 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,2 +1,3 @@
 # Add here internal Software Heritage dependencies, one per line.
+swh.core >= 0.3
 swh.model
diff --git a/setup.py b/setup.py
index da2505ddd4063f51e236d7df443752c7126d885c..5c0813281d59f8ee15e54f3545fc76331362baaf 100755
--- a/setup.py
+++ b/setup.py
@@ -69,6 +69,6 @@ setup(
     },
     entry_points="""
         [swh.cli.subcommands]
-        auth=swh.web.client.cli:auth
+        auth=swh.web.client.cli
     """,
 )
diff --git a/swh/web/client/cli.py b/swh/web/client/cli.py
index aca7e23b9e77de2fe8b2dcab70196879ccc19316..22666ddf7af238a6860d79eb12160a444719c28e 100644
--- a/swh/web/client/cli.py
+++ b/swh/web/client/cli.py
@@ -7,11 +7,12 @@
 # control
 import click
 from click.core import Context
+from swh.core.cli import swh as swh_cli_group
 
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
 
 
-@click.group(name="auth", context_settings=CONTEXT_SETTINGS)
+@swh_cli_group.group(name="auth", context_settings=CONTEXT_SETTINGS)
 @click.option(
     "--oidc-server-url",
     "oidc_server_url",