diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 4f7959f3fb0663059c07b9ad758e56f35731e766..dd72e3406d4d78b1035752fb2c22614d295fa6d9 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -204,6 +204,11 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
                 r.add((BuildBadgeAction)a);
             }
         }
+        if(isKeepLog()) {
+            if(r==null)
+                r = new ArrayList<BuildBadgeAction>();
+            r.add(new KeepLogBuildBadge());
+        }
         if(r==null)     return Collections.emptyList();
         else            return r;
     }
@@ -925,4 +930,14 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
             return entry.getTimestamp();
         }
     };
+
+    /**
+     * {@link BuildBadgeAction} that shows the logs are being kept.
+     */
+    public final class KeepLogBuildBadge implements BuildBadgeAction {
+        public String getIconFileName() { return null; }
+        public String getDisplayName() { return null; }
+        public String getUrlName() { return null; }
+        public String getWhyKeepLog() { return Run.this.getWhyKeepLog(); }
+    }
 }
diff --git a/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly b/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..9eb0fc2a08bb9479050803909739e92ee7bb7b4f
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly
@@ -0,0 +1,3 @@
+<img width="16" height="16"
+  title="${it.whyKeepLog}"
+  src="${imagesURL}/16x16/lock.gif"/>
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
index 27f0783daa816705756b571d0fbfb1d97a4019fb..bb11c7ce7ec3f824116fec39b349c1a2071252a5 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
@@ -12,11 +12,12 @@
       <a class="tip" href="${link}">
         <i:formatDate value="${build.timestamp.time}" type="both" dateStyle="medium" timeStyle="medium"/>
       </a>
-      <j:if test="${build.keepLog}">
+      <j:set var="badges" value="${build.badgeActions}"/>
+      <j:if test="${!empty(badges)}">
         <st:nbsp/>
-        <img width="16" height="16"
-          title="${build.whyKeepLog}"
-          src="${imagesURL}/16x16/lock.gif"/>
+        <j:forEach var="badge" items="${badges}">
+          <st:include it="${badge}" page="badge.jelly" />
+        </j:forEach>
       </j:if>
     </td>
   </tr>