diff --git a/Gemfile b/Gemfile
index 750c461b1..b253e8bf5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,8 @@ end
 
 gem 'jekyll-paginate', '~> 1.0'
 gem 'jekyll-coffeescript', '~> 1.0'
-gem 'jekyll-feed'
+gem 'jekyll-feed', '~> 0.1.3'
+gem 'jekyll-redirect-from', '~> 0.9.1'
 gem 'jekyll-gist', '~> 1.0'
 gem 'mime-types', '~> 3.0'
 gem 'kramdown', '~> 1.9'
diff --git a/site/_config.yml b/site/_config.yml
index e09c48570..c065f9f70 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -21,3 +21,4 @@ url: http://jekyllrb.com
 
 gems:
   - jekyll-feed
+  - jekyll-redirect-from
diff --git a/site/_docs/index.md b/site/_docs/index.md
index bbb180871..ceae4749f 100644
--- a/site/_docs/index.md
+++ b/site/_docs/index.md
@@ -2,6 +2,7 @@
 layout: docs
 title: Welcome
 permalink: /docs/home/
+redirect_from: /docs/index.html
 ---
 
 This site aims to be a comprehensive guide to Jekyll. We’ll cover topics such