diff --git a/requirements-swh.txt b/requirements-swh.txt
index 51a0067..7d8c1a3 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 da2505d..5c08132 100755
--- a/setup.py
+++ b/setup.py
@@ -1,74 +1,74 @@
 #!/usr/bin/env python3
 # Copyright (C) 2019-2020  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 from io import open
 from os import path
 
 from setuptools import find_packages, setup
 
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the README file
 with open(path.join(here, "README.rst"), encoding="utf-8") as f:
     long_description = f.read()
 
 
 def parse_requirements(name=None):
     if name:
         reqf = "requirements-%s.txt" % name
     else:
         reqf = "requirements.txt"
 
     requirements = []
     if not path.exists(reqf):
         return requirements
 
     with open(reqf) as f:
         for line in f.readlines():
             line = line.strip()
             if not line or line.startswith("#"):
                 continue
             requirements.append(line)
     return requirements
 
 
 # Edit this part to match your module.
 # Full sample:
 #   https://forge.softwareheritage.org/diffusion/DCORE/browse/master/setup.py
 setup(
     name="swh.web.client",  # example: swh.loader.pypi
     description="Software Heritage Web client",
     long_description=long_description,
     long_description_content_type="text/x-rst",
     python_requires=">=3.7",
     author="Software Heritage developers",
     author_email="swh-devel@inria.fr",
     url="https://forge.softwareheritage.org/source/swh-web-client/",
     packages=find_packages(),  # packages's modules
     install_requires=parse_requirements() + parse_requirements("swh"),
     tests_require=parse_requirements("test"),
     setup_requires=["setuptools-scm"],
     use_scm_version=True,
     extras_require={"testing": parse_requirements("test")},
     include_package_data=True,
     classifiers=[
         "Programming Language :: Python :: 3",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: OS Independent",
         "Development Status :: 3 - Alpha",
     ],
     project_urls={
         "Bug Reports": "https://forge.softwareheritage.org/maniphest",
         "Funding": "https://www.softwareheritage.org/donate",
         "Source": "https://forge.softwareheritage.org/source/swh-web-client",
         "Documentation": "https://docs.softwareheritage.org/devel/swh-web-client/",
     },
     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 aca7e23..22666dd 100644
--- a/swh/web/client/cli.py
+++ b/swh/web/client/cli.py
@@ -1,95 +1,96 @@
 # Copyright (C) 2020  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 # WARNING: do not import unnecessary things here to keep cli startup time under
 # 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",
     default="https://auth.softwareheritage.org/auth/",
     help=(
         "URL of OpenID Connect server (default to "
         '"https://auth.softwareheritage.org/auth/")'
     ),
 )
 @click.option(
     "--realm-name",
     "realm_name",
     default="SoftwareHeritage",
     help=(
         "Name of the OpenID Connect authentication realm "
         '(default to "SoftwareHeritage")'
     ),
 )
 @click.option(
     "--client-id",
     "client_id",
     default="swh-web",
     help=("OpenID Connect client identifier in the realm " '(default to "swh-web")'),
 )
 @click.pass_context
 def auth(ctx: Context, oidc_server_url: str, realm_name: str, client_id: str):
     """
     Authenticate Software Heritage users with OpenID Connect.
 
     This CLI tool eases the retrieval of a bearer token to authenticate
     a user querying the Software Heritage Web API.
     """
     from swh.web.client.auth import OpenIDConnectSession
 
     ctx.ensure_object(dict)
     ctx.obj["oidc_session"] = OpenIDConnectSession(
         oidc_server_url, realm_name, client_id
     )
 
 
 @auth.command("login")
 @click.argument("username")
 @click.pass_context
 def login(ctx: Context, username: str):
     """
     Login and create new offline OpenID Connect session.
 
     Login with USERNAME, create a new OpenID Connect session and get
     bearer token.
 
     User will be prompted for his password and tokens will be printed
     to standard output.
 
     The created OpenID Connect session is an offline one so the provided
     token has a much longer expiration time than classical OIDC
     sessions (usually several dozens of days).
     """
     from getpass import getpass
 
     password = getpass()
 
     oidc_info = ctx.obj["oidc_session"].login(username, password)
     if "refresh_token" in oidc_info:
         print(oidc_info["refresh_token"])
     else:
         print(oidc_info)
 
 
 @auth.command("logout")
 @click.argument("token")
 @click.pass_context
 def logout(ctx: Context, token: str):
     """
     Logout from an offline OpenID Connect session.
 
     Use TOKEN to logout from an offline OpenID Connect session.
 
     The token is definitely revoked after that operation.
     """
     ctx.obj["oidc_session"].logout(token)
     print("Successfully logged out from OpenID Connect session")