diff --git a/changelog.html b/changelog.html
index b14aa77c9db9c5cac6f0f64cf918bed6084b8e1b..0a546536cdd0ca8ec8f3c0674136877d1184ac77 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Fixed <tt>java.lang.NoSuchMethodError: hudson.model.RunMap.put(Lhudson/model/Run;)Lhudson/model/Run;</tt>
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15487">issue 15487</a>)
   <li class=bug>
     Saving the update center list after the metadata has been fetched results in 
     the metadata being persisted twice
diff --git a/core/src/main/java/hudson/model/RunMap.java b/core/src/main/java/hudson/model/RunMap.java
index 9207cfc44227575c091e5dcc45a25cdbd9aaf9e6..2b760b3efd7876ff050b181e3179024ab1938aa0 100644
--- a/core/src/main/java/hudson/model/RunMap.java
+++ b/core/src/main/java/hudson/model/RunMap.java
@@ -172,6 +172,11 @@ public final class RunMap<R extends Run<?,R>> extends AbstractLazyLoadRunMap<R>
         return r.getId();
     }
 
+    @Override
+    public R put(R r) {
+        return super._put(r);
+    }
+
     /**
      * Reuses the same reference as much as we can.
      * <p>
diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
index fb1377630463ac4eb9402d97041c87052f13a137..bf2af43617da02bb07b61dad4ec893c595d32496 100644
--- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
+++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
@@ -502,7 +502,11 @@ public abstract class AbstractLazyLoadRunMap<R> extends AbstractMap<Integer,R> i
         return search(n,Direction.EXACT);
     }
 
-    public final R put(R value) {
+    public R put(R value) {
+        return _put(value);
+    }
+
+    protected R _put(R value) {
         return put(getNumberOf(value),value);
     }