diff --git a/dclient/plugin.py b/dclient/plugin.py
new file mode 100644
index 0000000..7990c7f
--- /dev/null
+++ b/dclient/plugin.py
@@ -0,0 +1,8 @@
+from datasette import hookimpl
+
+
+@hookimpl
+def register_commands(cli):
+    from .cli import cli as dclient_cli
+
+    cli.add_command(dclient_cli, name="client")
diff --git a/setup.py b/setup.py
index 64cadf1..b2382c8 100644
--- a/setup.py
+++ b/setup.py
@@ -27,10 +27,10 @@ setup(
     license="Apache License, Version 2.0",
     version=VERSION,
     packages=["dclient"],
-    entry_points="""
-        [console_scripts]
-        dclient=dclient.cli:cli
-    """,
+    entry_points={
+        "datasette": ["client = dclient.plugin"],
+        "console_scripts": ["dclient = dclient.cli:cli"],
+    },
     install_requires=["click", "httpx", "appdirs"],
     extras_require={"test": ["pytest", "pytest-httpx", "cogapp", "pytest-mock"]},
     python_requires=">=3.7",