diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f07b2a64f..b1821ad04 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,6 +7,7 @@ Changelog
  * Redesigned and reorganised navigation menu to include a 'Settings' submenu
  * Added Groups administration area
  * Added Sites administration area
+ * Added the ability to lock a page to (temporarily) prevent edits to that page
  * Removed 'content_type' template filter from the project template, as the same thing can be accomplished with self.get_verbose_name|slugify
  * Page copy operations now also copy the page revision history
  * Page models now support a 'parent_page_types' property in addition to 'subpage types', to restrict the types of page they can be created under
diff --git a/docs/releases/0.7.rst b/docs/releases/0.7.rst
index d8d230fb9..ddc67d392 100644
--- a/docs/releases/0.7.rst
+++ b/docs/releases/0.7.rst
@@ -22,6 +22,12 @@ Groups and Sites administration interfaces
 The main navigation menu has been reorganised, placing site configuration options in a 'Settings' submenu. This includes two new items, which were previously only available through the Django admin backend: 'Groups', for setting up user groups with a specific set of permissions, and 'Sites', for managing the list of sites served by this Wagtail instance.
 
 
+Page locking
+~~~~~~~~~~~~
+
+Moderators and administrators now have the ability to lock a page, preventing further edits from being made to that page until it is unlocked again.
+
+
 Minor features
 ~~~~~~~~~~~~~~
 
@@ -65,5 +71,15 @@ Title boost on search reduced to 2
 Wagtail's search interface applies a 'boost' value to give extra weighting to matches on the title field. The original boost value of 100 was found to be excessive, and in Wagtail 0.7 this has been reduced to 2. If you have used comparable boost values on other fields, to give them similar weighting to title, you may now wish to reduce these accordingly. See :ref:`wagtailsearch_indexing`.
 
 
+Addition of ``locked`` field to Page model
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The page locking mechanism adds a ``locked`` field to wagtailcore.Page, defaulting to False. Any application code working with Page objects should be unaffected, but any code that creates page records using direct SQL, or within existing South migrations using South's frozen ORM, will fail as this code will be unaware of the new database column. To fix a South migration that fails in this way, add the following line to the ``'wagtailcore.page'`` entry at the bottom of the migration file:
+
+.. code-block:: python
+
+  'locked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+
+
 Deprecated features
 ===================