diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index 985d34c1c2..572a3c6f42 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -586,11 +586,8 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
         }
     }
 
-    /**
-     * People can stop a build if they can start a build.
-     */
     public void checkAbortPermission() {
-        getParent().getACL().checkPermission(AbstractProject.BUILD);
+        getParent().getACL().checkPermission(AbstractProject.ABORT);
     }
 
 //
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index 5197745696..4f3103b2cf 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -937,4 +937,8 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
     private static final Logger LOGGER = Logger.getLogger(AbstractProject.class.getName());
 
     public static final Permission BUILD = new Permission(PERMISSIONS, "Build", Permission.UPDATE);
+    /**
+     * Permission to abort a build. For now, let's make it the same as {@link #BUILD}
+     */
+    public static final Permission ABORT = BUILD;
 }
diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java
index 88b2859b32..71c8b32f6b 100644
--- a/core/src/main/java/hudson/model/Executor.java
+++ b/core/src/main/java/hudson/model/Executor.java
@@ -8,6 +8,7 @@ import javax.servlet.ServletException;
 
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
+import org.acegisecurity.AccessDeniedException;
 
 
 /**
@@ -162,6 +163,18 @@ public class Executor extends Thread implements ModelObject {
         rsp.forwardToPreviousPage(req);
     }
 
+    /**
+     * Checks if the current user has a permission to stop this build. 
+     */
+    public boolean hasStopPermission() {
+        try {
+            executable.checkAbortPermission();
+            return true;
+        } catch (AccessDeniedException e) {
+            return false;
+        }
+    }
+
     public Computer getOwner() {
         return owner;
     }
diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly
index 5c549851e9..b5677c1bb5 100644
--- a/core/src/main/resources/lib/hudson/executors.jelly
+++ b/core/src/main/resources/lib/hudson/executors.jelly
@@ -58,9 +58,9 @@
                 <t:buildProgressBar build="${e.currentExecutable}"/>
 	            </td>
 	            <td class="pane" width="16" align="center" valign="middle">
-                <l:isAdmin>
+                <j:if test="${e.hasStopPermission()}">
                   <a href="${rootURL}/computers/${cloop.index}/executors/${eloop.index}/stop"><img src="${imagesURL}/16x16/stop.gif" alt="${%terminate this build}" /></a>
-                </l:isAdmin>
+                </j:if>
 	            </td>
 	          </j:otherwise>
 	        </j:choose>