diff --git a/changelog.html b/changelog.html
index b9f8cb6e00e6..cd1527714f7e 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,10 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Build history widget only showed the last day of builds.
+    (Due to JENKINS-20892, even with this fix at most 20 builds are shown.)
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21159">issue 21159</a>)
   <li class=rfe>
     Split the “raw HTML” markup formatter out of core into a bundled plugin.
 </ul>
diff --git a/core/src/test/java/hudson/util/RunListTest.java b/core/src/test/java/hudson/util/RunListTest.java
index 4c3031454e08..535bb9383140 100644
--- a/core/src/test/java/hudson/util/RunListTest.java
+++ b/core/src/test/java/hudson/util/RunListTest.java
@@ -23,14 +23,12 @@
  */
 package hudson.util;
 
-import static org.mockito.Mockito.when;
 import hudson.model.Run;
-
 import java.util.ArrayList;
-
 import junit.framework.TestCase;
-
 import org.junit.runner.RunWith;
+import org.jvnet.hudson.test.Bug;
+import static org.mockito.Mockito.when;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -73,6 +71,7 @@ public void testbyTimestampAllRuns() {
 
 	}
 
+    @Bug(21159)
 	@PrepareForTest({Run.class})
 	public void testbyTimestampFirstRun() {
 		setUpByTimestampRuns();