diff --git a/site/README b/site/README
deleted file mode 100644
index 60b411cb..00000000
--- a/site/README
+++ /dev/null
@@ -1 +0,0 @@
-Jekyll's awesome website.
diff --git a/site/README.md b/site/README.md
new file mode 100644
index 00000000..d98f6db7
--- /dev/null
+++ b/site/README.md
@@ -0,0 +1,15 @@
+# Jekyll docs site
+
+This directory contains the code for the Jekyll docs site, [jekyllrb.com](http://jekyllrb.com/).
+
+## Contributing
+
+For information about contributing, see the [Contributing page](http://jekyllrb.com/docs/contributing/).
+
+## Running locally
+
+You can preview your contributions before opening a pull request by running from within the directory:
+1. `bundle install`
+2. `bundle exec rake site:preview`
+
+It's just a jekyll site, afterall! :wink:
\ No newline at end of file
diff --git a/site/_docs/troubleshooting.md b/site/_docs/troubleshooting.md
index 14023094..4bb12be8 100644
--- a/site/_docs/troubleshooting.md
+++ b/site/_docs/troubleshooting.md
@@ -11,6 +11,12 @@ that might be of help. If the problem you’re experiencing isn’t covered belo
 please [report an issue]({{site.help_url}}/issues/new) so the
 Jekyll community can make everyone’s experience better.
 
+- [Installation Problems](#installation-problems)
+- [Problems running Jekyll](#problems-running-jekyll)
+- [Base-URL Problems](#base-url-problems)
+- [Configuration problems](#configuration-problems)
+- [Markup Problems](#markup-problems)
+
 ## Installation Problems
 
 If you encounter errors during gem installation, you may need to install