diff --git a/docs/changelog.rst b/docs/changelog.rst
index e197c6c..9d4770f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,6 +2,16 @@
  Changelog
 ===========
 
+.. _v3_6:
+
+3.6 (2021-02-18)
+----------------
+
+This release adds the ability to execute queries joining data from more than one database file - similar to the cross database querying feature introduced in `Datasette 0.55 <https://docs.datasette.io/en/stable/changelog.html#v0-55>`__.
+
+- The ``db.attach(alias, filepath)`` Python method can be used to attach extra databases to the same connection, see :ref:`db.attach() in the Python API documentation <python_api_attach>`. (`#113 <https://github.com/simonw/sqlite-utils/issues/113>`__)
+- The ``--attach`` option attaches extra aliased databases to run SQL queries against directly on the command-line, see :ref:`attaching additional databases in the CLI documentation <cli_attach>`. (`#236 <https://github.com/simonw/sqlite-utils/issues/236>`__)
+
 .. _v3_5:
 
 3.5 (2021-02-14)
diff --git a/docs/cli.rst b/docs/cli.rst
index b3fbc1a..c015d78 100644
--- a/docs/cli.rst
+++ b/docs/cli.rst
@@ -124,7 +124,7 @@ You can use the ``--json-cols`` option to automatically detect these JSON column
         }
     ]
 
-.. cli_attach:
+.. _cli_attach:
 
 Attaching additional databases
 ------------------------------
diff --git a/setup.py b/setup.py
index bdcb829..6e7f978 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import io
 import os
 
-VERSION = "3.5"
+VERSION = "3.6"
 
 
 def get_long_description():