diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1e59bb640..32a20f076 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,8 @@ Changelog
 2.4 (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~
 
+ * Added support for Python 3.7 (Matt Westcott)
+
 
 2.3 LTS (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~~~~~
diff --git a/README.md b/README.md
index 14e4f65da..6ba31dbde 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Wagtail is used by NASA, Google, Oxfam, the NHS, Mozilla, MIT, the Red Cross, Sa
 Wagtail supports:
 
 * Django 2.0.x and 2.1.x
-* Python 3.4, 3.5 and 3.6
+* Python 3.4, 3.5, 3.6 and 3.7
 * PostgreSQL, MySQL and SQLite as database backends
 
 Previous versions of Wagtail (1.13 and earlier) additionally supported Python 2.7 and Django 1.x.
diff --git a/docs/releases/2.4.rst b/docs/releases/2.4.rst
index 7024ac6ab..1c287acc5 100644
--- a/docs/releases/2.4.rst
+++ b/docs/releases/2.4.rst
@@ -14,6 +14,8 @@ What's new
 Other features
 ~~~~~~~~~~~~~~
 
+ * Added support for Python 3.7 (Matt Westcott)
+
 
 Bug fixes
 ~~~~~~~~~
diff --git a/docs/releases/upgrading.rst b/docs/releases/upgrading.rst
index 448df2d8a..389fef093 100644
--- a/docs/releases/upgrading.rst
+++ b/docs/releases/upgrading.rst
@@ -139,4 +139,6 @@ The compatible versions of Django and Python for each Wagtail release are:
 +-------------------+------------------------------+-----------------------------+
 | 2.3 LTS           | 1.11, 2.0, 2.1               | 3.4, 3.5, 3.6               |
 +-------------------+------------------------------+-----------------------------+
+| 2.4               | 2.0, 2.1                     | 3.4, 3.5, 3.6, 3.7          |
++-------------------+------------------------------+-----------------------------+
 
diff --git a/setup.py b/setup.py
index 69eb90677..b8d2ae6ea 100755
--- a/setup.py
+++ b/setup.py
@@ -92,8 +92,8 @@ https://github.com/wagtail/wagtail/.",
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Framework :: Django',
-        'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.1',
         'Framework :: Wagtail',