diff --git a/README.md b/README.md
index cefeed8e..4dfb1ede 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Documentation: http://datasette.readthedocs.io/ Examples: https://github.com/si
 
 ## News
 
+* 20th May 2018: [Datasette 0.22: Datasette Facets](https://simonwillison.net/2018/May/20/datasette-facets)
 * 5th May 2018: [Datasette 0.21: New _shape=, new _size=, search within columns](https://github.com/simonw/datasette/releases/tag/0.21)
 * 25th April 2018: [Exploring the UK Register of Members Interests with SQL and Datasette](https://simonwillison.net/2018/Apr/25/register-members-interests/) - a tutorial describing how [register-of-members-interests.datasettes.com](https://register-of-members-interests.datasettes.com/) was built ([source code here](https://github.com/simonw/register-of-members-interests))
 * 20th April 2018: [Datasette plugins, and building a clustered map visualization](https://simonwillison.net/2018/Apr/20/datasette-plugins/) - introducing Datasette's new plugin system and [datasette-cluster-map](https://pypi.org/project/datasette-cluster-map/), a plugin for visualizing data on a map
diff --git a/datasette/version.py b/datasette/version.py
index 478709fb..00ae20eb 100644
--- a/datasette/version.py
+++ b/datasette/version.py
@@ -1,2 +1,2 @@
-__version_info__ = (0, 21)
+__version_info__ = (0, 22)
 __version__ = '.'.join(map(str, __version_info__))
diff --git a/docs/changelog.rst b/docs/changelog.rst
index e2bd4375..a974af8e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,46 @@
 Changelog
 =========
 
+0.22 (2018-05-20)
+-----------------
+
+The big new feature in this release is :ref:`facets`. Datasette can now apply faceted browse to any column in any table. It will also suggest possible facets. See the `Datasette Facets <https://simonwillison.net/2018/May/20/datasette-facets/>`_ announcement post for more details.
+
+In addition to the work on facets:
+
+- Added `docs for introspection endpoints <https://datasette.readthedocs.io/en/latest/introspection.html>`_
+
+- New ``--config`` option, added ``--help-config``, closes `#274 <https://github.com/simonw/datasette/issues/274>`_
+
+  Removed the ``--page_size=`` argument to ``datasette serve`` in favour of::
+
+      datasette serve --config default_page_size:50 mydb.db
+
+  Added new help section::
+
+      $ datasette --help-config
+      Config options:
+        default_page_size            Default page size for the table view
+                                     (default=100)
+        max_returned_rows            Maximum rows that can be returned from a table
+                                     or custom query (default=1000)
+        sql_time_limit_ms            Time limit for a SQL query in milliseconds
+                                     (default=1000)
+        default_facet_size           Number of values to return for requested facets
+                                     (default=30)
+        facet_time_limit_ms          Time limit for calculating a requested facet
+                                     (default=200)
+        facet_suggest_time_limit_ms  Time limit for calculating a suggested facet
+                                     (default=50)
+- Only apply responsive table styles to ``.rows-and-column``
+
+  Otherwise they interfere with tables in the description, e.g. on
+  https://fivethirtyeight.datasettes.com/fivethirtyeight/nba-elo%2Fnbaallelo
+
+- Refactored views into new ``views/`` modules, refs `#256 <https://github.com/simonw/datasette/issues/256>`_
+- `Documentation for SQLite full-text search <http://datasette.readthedocs.io/en/latest/full_text_search.html>`_ support, closes `#253 <https://github.com/simonw/datasette/issues/253>`_
+- ``/-/versions`` now includes SQLite ``fts_versions``, closes `#252 <https://github.com/simonw/datasette/issues/252>`_
+
 0.21 (2018-05-05)
 -----------------