diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4419804a5..b59955e10 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Changelog
 
  * Added support for Django 2.1 (Ryan Verner, Matt Westcott)
  * Added 'scale' image filter (Oliver Wilkerson)
+ * Added meta tag to prevent search engines from indexing admin pages (Karl Hobley)
 
 
 2.2 (xx.xx.xxx) - IN DEVELOPMENT
diff --git a/docs/releases/2.3.rst b/docs/releases/2.3.rst
index b4dce5cce..8fb10bbbb 100644
--- a/docs/releases/2.3.rst
+++ b/docs/releases/2.3.rst
@@ -23,6 +23,7 @@ Other features
 ~~~~~~~~~~~~~~
 
  * Added 'scale' image filter (Oliver Wilkerson)
+ * Added meta tag to prevent search engines from indexing admin pages (Karl Hobley)
 
 
 Bug fixes
diff --git a/wagtail/admin/templates/wagtailadmin/skeleton.html b/wagtail/admin/templates/wagtailadmin/skeleton.html
index 3b1f0619b..c610429fb 100644
--- a/wagtail/admin/templates/wagtailadmin/skeleton.html
+++ b/wagtail/admin/templates/wagtailadmin/skeleton.html
@@ -6,6 +6,7 @@
     <title>Wagtail - {% block titletag %}{% endblock %}</title>
     <meta name="description" content="" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="robots" content="noindex" />
 
     <script src="{% static 'wagtailadmin/js/vendor/modernizr-2.6.2.min.js' %}"></script>