diff --git a/.gitignore b/.gitignore
index ae73f8379..2bdf8f7eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 *~
 .*
 
-html/
+site/
 htmlcov/
 coverage/
 build/
diff --git a/mkdocs.yml b/mkdocs.yml
index 925586d19..f956ecf0b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -4,6 +4,8 @@ site_description: Django REST framework - Web APIs for Django
 
 repo_url: https://github.com/tomchristie/django-rest-framework
 
+theme_dir: docs_theme
+
 pages:
  - ['index.md', ]
  - ['tutorial/quickstart.md', ]
@@ -52,7 +54,5 @@ pages:
  - ['topics/release-notes.md', 'Topics', 'Release Notes']
  - ['topics/credits.md', 'Topics', 'Credits']
 
-site_dir: html
-theme_dir: docs_theme
 copyright: Copyright &copy; 2014, <a href='https://twitter.com/_tomchristie'>Tom Christie</a>.
 google_analytics: ['UA-18852272-2', 'django-rest-framework.org']