diff --git a/HISTORY.rst b/HISTORY.rst
index 01ba326780..578641d175 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -2,6 +2,21 @@
 History
 =======
 
+3.21.0 (2020-10-15)
+-------------------
+
+Changes:
+
+- The ``update_admin_profile`` task now accepts the ``api_names`` option to target extra Profiles, even when using a custom ``package.xml``.
+- The ``github_automerge_main`` task can now be used on source branches other than the default branch to merge them into branches starting with the ``branch_prefix`` option, as long as the source branch does not also start with ``branch_prefix``.
+- Added preflight check tasks to validate org settings (``check_org_settings_value``) and to check that Chatter is enabled (``check_chatter_enabled``). These are intended for use with MetaDeploy install plans.
+- Updated to `Snowfakery 1.2 <https://github.com/SFDO-Tooling/Snowfakery/releases/tag/v1.2>`_.
+
+Issues closed:
+
+- Fixed an issue in the ``load_dataset`` task which left out non-Person-Account Contacts if the dataset was extracted using the REST API.
+
+
 3.20.1 (2020-10-05)
 -------------------
 
diff --git a/cumulusci/version.txt b/cumulusci/version.txt
index 076e9c774e..6075c9a9ff 100644
--- a/cumulusci/version.txt
+++ b/cumulusci/version.txt
@@ -1 +1 @@
-3.20.1
+3.21.0