diff --git a/changelog.html b/changelog.html
index 2acadb15b7a808a37fbf9f77c8d6a2adfb43ee34..813fe871a14d360d26a8c6fd6a488ce7d7965e88 100644
--- a/changelog.html
+++ b/changelog.html
@@ -63,6 +63,8 @@ Upcoming changes</a>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-16342">issue 16342</a>)
   <li class=bug>
     Improved logging and error output from SSHD in Jenkins.
+  <li class=rfe>
+    Linking to the <code>/threadDump</code> page from <code>/systemInfo</code> so it is discoverable.
   <li class=bug>
     Links should preserve used protocol
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-16368">issue 16368</a>)
diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly
index c18e8770352658688440a6f3d26d75998e318c41..89c0d958c1e3c2e6bcb1b3c9d319511d20e21eb4 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly
@@ -61,6 +61,8 @@ THE SOFTWARE.
             </j:otherwise>
           </j:choose>
         </table>
+        <h1>${%Thread Dumps}</h1>
+        <p>${%threadDump_blurb('threadDump')}</p>
     </l:main-panel>
   </l:layout>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b1438e6fbba2440c77891eb8aa4fbaf504046bb8
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.properties
@@ -0,0 +1 @@
+threadDump_blurb=Visit <a href="{0}">this page</a> for master and slave thread dumps.