diff --git a/_data/docs-home.yml b/_data/docs-home.yml
index 5709d3e4e1e..8a167c17896 100644
--- a/_data/docs-home.yml
+++ b/_data/docs-home.yml
@@ -10,6 +10,8 @@ toc:
 - title: Release Roadmap
   path: https://github.com/kubernetes/kubernetes/milestones/
 
+- docs/tasks/debug-application-cluster/troubleshooting.md
+
 - title: Contributing to the Kubernetes Docs
   section:
   - editdocs.md
@@ -19,5 +21,3 @@ toc:
   - docs/home/contribute/page-templates.md
   - docs/home/contribute/review-issues.md
   - docs/home/contribute/style-guide.md
- 
-
diff --git a/_data/tasks.yml b/_data/tasks.yml
index f75f6fdd3bf..ca186c50db8 100644
--- a/_data/tasks.yml
+++ b/_data/tasks.yml
@@ -62,17 +62,16 @@ toc:
 
 - title: Monitoring, Logging, and Debugging
   section:
+  - docs/tasks/debug-application-cluster/monitor-node-health.md
+  - docs/tasks/debug-application-cluster/logging-stackdriver.md
+  - docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md
   - docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
   - docs/tasks/debug-application-cluster/debug-init-containers.md
-  - docs/tasks/debug-application-cluster/logging-stackdriver.md
-  - docs/tasks/debug-application-cluster/monitor-node-health.md
-  - docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md
-  - docs/tasks/debug-application-cluster/debug-application.md
-  - docs/tasks/debug-application-cluster/debug-application-introspection.md
-  - docs/tasks/debug-application-cluster/debug-cluster.md
   - docs/tasks/debug-application-cluster/debug-pod-replication-controller.md
   - docs/tasks/debug-application-cluster/debug-service.md
-  - docs/tasks/debug-application-cluster/troubleshooting.md
+  - docs/tasks/debug-application-cluster/debug-cluster.md
+  - docs/tasks/debug-application-cluster/debug-application.md
+  - docs/tasks/debug-application-cluster/debug-application-introspection.md
   - title: Using Explorer to Examine the Runtime Environment
     path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/explorer
 
diff --git a/docs/home/index.md b/docs/home/index.md
index d64c65f7501..399a0ac2ce4 100644
--- a/docs/home/index.md
+++ b/docs/home/index.md
@@ -43,6 +43,10 @@ The [Reference](/docs/reference/) documentation provides complete information on
 
 The [Tools](/docs/tools/) page contains a list of native and third-party tools for Kubernetes.
 
+## Troubleshooting
+
+The [Troubleshooting](/docs/tasks/debug-application-cluster/troubleshooting) page outlines some resources for troubleshooting and finding help.
+
 ## Frequently Asked Questions
 
 * [User FAQ](https://github.com/kubernetes/kubernetes/wiki/User-FAQ)
diff --git a/docs/tasks/debug-application-cluster/troubleshooting.md b/docs/tasks/debug-application-cluster/troubleshooting.md
index 49d9f3741bb..9253963ff31 100644
--- a/docs/tasks/debug-application-cluster/troubleshooting.md
+++ b/docs/tasks/debug-application-cluster/troubleshooting.md
@@ -3,28 +3,35 @@ assignees:
 - brendandburns
 - davidopp
 title: Troubleshooting
+redirect_from:
+- "/docs/troubleshooting/"
 ---
 
-## Troubleshooting
-
 Sometimes things go wrong. This guide is aimed at making them right. It has
 two sections:
 
-   * [Troubleshooting your application](/docs/user-guide/application-troubleshooting) - Useful for users who are deploying code into Kubernetes and wondering why it is not working.
-   * [Troubleshooting your cluster](/docs/admin/cluster-troubleshooting) - Useful for cluster administrators and people whose Kubernetes cluster is unhappy.
+   * [Troubleshooting your application](/docs/tasks/debug-application-cluster/debug-application/) - Useful for users who are deploying code into Kubernetes and wondering why it is not working.
+   * [Troubleshooting your cluster](/docs/tasks/debug-application-cluster/debug-cluster/) - Useful for cluster administrators and people whose Kubernetes cluster is unhappy.
 
 You should also check the known issues for the [release](https://github.com/kubernetes/kubernetes/releases)
 you're using.
 
-### Getting help
+## Getting help
 
 If your problem isn't answered by any of the guides above, there are variety of
 ways for you to get help from the Kubernetes team.
 
 ### Questions
 
-If you aren't familiar with it, many of your questions may be answered by the
-[user guide](/docs/user-guide/).
+The documentation on this site has been structured to provide answers to a wide
+range of questions. [Concepts](/docs/concepts/) explain the Kubernetes
+architecture and how each component works, while [Setup](/docs/setup/) provides
+practical instructions for getting started. [Tasks](/docs/tasks/) show how to
+accomplish commonly used tasks, and [Tutorials](/docs/tutorials/) are more
+comprehensive walkthroughs of real-world, industry-specific, or end-to-end
+development scenarios. The [Reference](/docs/reference/) section provides
+detailed documentation on the [Kubernetes API](/docs/api-reference/{{page.version}}/)
+and command-line interfaces (CLIs), such as [`kubectl`](/docs/user-guide/kubectl-overview/).
 
 We also have a number of FAQ pages:
 
diff --git a/js/redirects.js b/js/redirects.js
index 7a3447c6740..39f39a99495 100644
--- a/js/redirects.js
+++ b/js/redirects.js
@@ -72,6 +72,10 @@ $( document ).ready(function() {
     {
         "from": "/docs/admin/multiple-schedulers",
         "to": "/docs/tutorials/clusters/multiple-schedulers/"
+    },
+    {
+        "from": "/docs/troubleshooting/",
+        "to": "/docs/tasks/debug-application-cluster/troubleshooting/"
     }];
 
     forwardingRules.forEach(function(rule) {