diff --git a/changelog.html b/changelog.html
index b695281af8565572931fdae67c64aa15648005bf..247914a445a2a4d522cda3df8b41f908a1d4d95e 100644
--- a/changelog.html
+++ b/changelog.html
@@ -80,6 +80,9 @@ Upcoming changes</a>
   <li class=bug>
     Fix deadlock between hudson.model.Queue and hudson.model.Computer.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-288040">issue 28840</a>)
+  <li class=bug>
+    Fix jobs getting stuck in the Queue when there exists a cycle of upstream/downstream blocks between them.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-28926">issue 28926</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 <h3><a name=v1.617>What's new in 1.617</a> (2015/06/07)</h3>
diff --git a/core/src/main/java/hudson/model/queue/QueueSorter.java b/core/src/main/java/hudson/model/queue/QueueSorter.java
index 296312b73ba33bd2c283f79a3ed444f5f3da4f89..251f8d72b80723959d266df1d7130326a0c80cf2 100644
--- a/core/src/main/java/hudson/model/queue/QueueSorter.java
+++ b/core/src/main/java/hudson/model/queue/QueueSorter.java
@@ -26,7 +26,7 @@ public abstract class QueueSorter implements ExtensionPoint {
      * (We want the time since in queue by default as blocking on upstream/downstream considers waiting items
      * also and thus the blocking starts once the task is in the queue not once the task is buildable)
      *
-     * @since 1.FIXME
+     * @since 1.618
      */
     public static final Comparator<Queue.BlockedItem> DEFAULT_BLOCKED_ITEM_COMPARATOR = new Comparator<Queue.BlockedItem>() {
         @Override
@@ -50,7 +50,7 @@ public abstract class QueueSorter implements ExtensionPoint {
      *
      * @param blockedItems
      *      List of blocked items in the queue. Never null.
-     * @since 1.FIXME
+     * @since 1.618
      */
     public void sortBlockedItems(List<Queue.BlockedItem> blockedItems) {
         Collections.sort(blockedItems, DEFAULT_BLOCKED_ITEM_COMPARATOR);