diff --git a/docs/README.md b/docs/README.md
index e86fc1be429..fc9f925d0c6 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -56,7 +56,7 @@ Documentation for other releases can be found at
   folder.
 
 * If something went wrong, see the [troubleshooting](troubleshooting.md) document for how to debug.
-You should also check the [known issues](user-guide/known-issues.md) for the release you're using.
+You should also check the [known issues for the release](../CHANGELOG.md) you're using.
 
 * To report a security issue, see [Reporting a Security Issue](reporting-security-issues.md).
 
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index df712a48fb6..f2200ee38ff 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -38,7 +38,7 @@ Sometimes things go wrong.  This guide is aimed at making them right.  It has tw
    * [Troubleshooting your application](user-guide/application-troubleshooting.md) - Useful for users who are deploying code into Kubernetes and wondering why it is not working.
    * [Troubleshooting your cluster](admin/cluster-troubleshooting.md) - Useful for cluster administrators and people whose Kubernetes cluster is unhappy.
 
-You should also check the [known issues](user-guide/known-issues.md) for the release you're using.
+You should also check the [known issues for the release](../CHANGELOG.md) you're using.
 
 # Getting help
 
diff --git a/docs/user-guide/known-issues.md b/docs/user-guide/known-issues.md
index c8918f08621..7807ba65d07 100644
--- a/docs/user-guide/known-issues.md
+++ b/docs/user-guide/known-issues.md
@@ -32,8 +32,7 @@ Documentation for other releases can be found at
 
 <!-- END MUNGE: UNVERSIONED_WARNING -->
 
-This file has moved to: http://kubernetes.github.io/docs/user-guide/known-issues/
-
+This file has moved to: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/known-issues.md?pixel)]()