diff --git a/website/config.rb b/website/config.rb
index 4c4a40637..993fc7347 100644
--- a/website/config.rb
+++ b/website/config.rb
@@ -109,3 +109,7 @@ helpers do
     return classes.join(" ")
   end
 end
+
+# Netlify redirects/headers
+proxy '_redirects', 'netlify-redirects', ignore: true
+proxy '_headers', 'netlify-headers', ignore: true
diff --git a/website/redirects.txt b/website/source/_redirects
similarity index 88%
rename from website/redirects.txt
rename to website/source/_redirects
index 108cb8fed..58a2c8c29 100644
--- a/website/redirects.txt
+++ b/website/source/_redirects
@@ -21,3 +21,6 @@
 /docs/platforms.html                            /docs/builders/index.html
 /intro/platforms.html                           /docs/builders/index.html
 /docs/templates/configuration-templates.html    /docs/templates/engine.html
+/docs/machine-readable/*                        /docs/commands/index.html
+/docs/command-line/*                            /docs/commands/
+/docs/extend/*                                  /docs/extending/