diff --git a/_data/support.yml b/_data/support.yml
index cb2c891d75..40b03b73e0 100644
--- a/_data/support.yml
+++ b/_data/support.yml
@@ -3,15 +3,6 @@ abstract: "Troubleshooting resources, frequently asked questions, and community
 toc:
 - docs/troubleshooting.md
 
-- title: Frequently Asked Questions
-  section:
-  - title: User FAQ
-    path: https://github.com/kubernetes/kubernetes/wiki/User-FAQ/
-  - title: Debugging FAQ
-    path: https://github.com/kubernetes/kubernetes/wiki/Debugging-FAQ/
-  - title: Services FAQ
-    path: https://github.com/kubernetes/kubernetes/wiki/Services-FAQ/
-
 - title: Other Resources
   section:
   - title: Kubernetes Issue Tracker on GitHub
diff --git a/docs/home/index.md b/docs/home/index.md
index 35302775ce..11b2ed171c 100644
--- a/docs/home/index.md
+++ b/docs/home/index.md
@@ -43,3 +43,12 @@ redirect_from:
 <h2>Tools</h2>
 
 <p>The <a href="/docs/tools/">tools</a> page contains a list of native and third-party tools for Kubernetes.</p>
+
+<h2>Frequently Asked Questions</h2>
+
+* <a href="https://github.com/kubernetes/kubernetes/wiki/User-FAQ">User FAQ</a>
+* <a href="https://github.com/kubernetes/kubernetes/wiki/Debugging-FAQ">Debugging FAQ</a>
+* <a href="https://github.com/kubernetes/kubernetes/wiki/Services-FAQ">Services FAQ</a>
+
+
+