diff --git a/changelog.html b/changelog.html
index 61f1a6c68a94962308b398934cef7726a23e59d9..1d34749c3d9036b59a7bf4eff026a47c22990cb8 100644
--- a/changelog.html
+++ b/changelog.html
@@ -273,6 +273,9 @@ Upcoming changes</a>
   <li class=bug>
     Improved UI for implicitly locked builds.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10197">issue 10197</a>)
+  <li class=bug>
+    Incorrect URL computation broke context menu for computers with spaces in their names.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18236">issue 18236</a>)
   <li class=rfe>
     Promote the use of 'H' in cron.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17311">issue 17311</a>)