diff --git a/_redirects b/_redirects
new file mode 100644
index 000000000..991abd4e3
--- /dev/null
+++ b/_redirects
@@ -0,0 +1,4 @@
+/esphomeyaml/* /:splat 301
+
+# Moved components
+# e.g: /components/sensors/abc.html /components/sensors/xyz.html 301
diff --git a/netlify.toml b/netlify.toml
index 418d43ee0..da9727eed 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -11,8 +11,3 @@
 
 [context.production]
   environment = { BASE_URL = "https://esphome.io", PRODUCTION = "YES" }
-
-# A basic redirect rule
-[[redirects]]
-  from = "/esphomeyaml/*"
-  to = "/:splat"