diff --git a/docs/index.rst b/docs/index.rst
index b2d9a534d2..a040fe767c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,7 +13,7 @@ It supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Django 1.7 suppo
    building_your_site/index
    editing_api
    snippets
-   wagtailsearch/index
+   search/index
    form_builder
    model_recipes
    advanced_topics
diff --git a/docs/wagtailsearch/backends.rst b/docs/search/backends.rst
similarity index 100%
rename from docs/wagtailsearch/backends.rst
rename to docs/search/backends.rst
diff --git a/docs/wagtailsearch/editors_picks.rst b/docs/search/editors_picks.rst
similarity index 100%
rename from docs/wagtailsearch/editors_picks.rst
rename to docs/search/editors_picks.rst
diff --git a/docs/wagtailsearch/for_python_developers.rst b/docs/search/for_python_developers.rst
similarity index 100%
rename from docs/wagtailsearch/for_python_developers.rst
rename to docs/search/for_python_developers.rst
diff --git a/docs/wagtailsearch/frontend_views.rst b/docs/search/frontend_views.rst
similarity index 100%
rename from docs/wagtailsearch/frontend_views.rst
rename to docs/search/frontend_views.rst
diff --git a/docs/wagtailsearch/index.rst b/docs/search/index.rst
similarity index 92%
rename from docs/wagtailsearch/index.rst
rename to docs/search/index.rst
index c11d7f675d..e343f76c87 100644
--- a/docs/wagtailsearch/index.rst
+++ b/docs/search/index.rst
@@ -2,8 +2,8 @@
 .. _wagtailsearch:
 
 
-Wagtailsearch
-=============
+Search
+======
 
 Wagtail provides a comprehensive and extensible search interface. In addition, it provides ways to promote search results through "Editor's Picks." Wagtail also collects simple statistics on queries made through the search interface.