diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 31c036509f..781fc59a78 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -28,6 +28,7 @@ Changelog
  * Fix: Tabs in "insert link" modal in the rich text editor no longer disappear (Tim Heap)
  * Fix: H2 elements in rich text fields were accidentally given a click() binding when put insite a collapsible multi field panel
  * Fix: The wagtailimages module is now compatible with remote storage backends that do not allow reopening closed files
+ * Fix: Search no longer crashes when auto-indexing a model that doesn't have an id field (Scot Hacker)
 
 
 1.0 (16.07.2015)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 705f9129dc..6eb7d26bdf 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -59,6 +59,8 @@ Contributors
 * Piet Delport
 * Tom Christie
 * Michael van Tellingen
+* Scot Hacker
+
 
 Translators
 ===========
diff --git a/docs/releases/1.1.rst b/docs/releases/1.1.rst
index 50405d331e..517931ff75 100644
--- a/docs/releases/1.1.rst
+++ b/docs/releases/1.1.rst
@@ -64,6 +64,7 @@ Bug fixes
  * Tabs in "insert link" modal in the rich text editor no longer disappear (Tim Heap)
  * H2 elements in rich text fields were accidentally given a click() binding when put insite a collapsible multi field panel
  * The ``wagtailimages`` module is now compatible with remote storage backends that do not allow reopening closed files
+ * Search no longer crashes when auto-indexing a model that doesn't have an ``id`` field
 
 
 Upgrade considerations