diff --git a/core/src/main/java/hudson/tasks/Ant.java b/core/src/main/java/hudson/tasks/Ant.java
index c8f216688003f77ac1a7820c99c4d33db4359806..51e30b791d61d9132c96464131c8edd9d6f53e25 100644
--- a/core/src/main/java/hudson/tasks/Ant.java
+++ b/core/src/main/java/hudson/tasks/Ant.java
@@ -248,7 +248,7 @@ public class Ant extends Builder {
     }
 
     @Extension
-    public static class DescriptorImpl extends Descriptor<Builder> {
+    public static class DescriptorImpl extends BuildStepDescriptor<Builder> {
         @CopyOnWrite
         private volatile AntInstallation[] installations = new AntInstallation[0];
 
@@ -256,6 +256,10 @@ public class Ant extends Builder {
             load();
         }
 
+        public boolean isApplicable(Class<? extends AbstractProject> jobType) {
+            return true;
+        }
+
         protected DescriptorImpl(Class<? extends Ant> clazz) {
             super(clazz);
         }
diff --git a/core/src/main/java/hudson/tasks/BatchFile.java b/core/src/main/java/hudson/tasks/BatchFile.java
index bfa9fa2e3c4fa5915980b7ab818dbe615b245c60..6fa8c57db739f70ce1885ca56e14aa8b67c34079 100644
--- a/core/src/main/java/hudson/tasks/BatchFile.java
+++ b/core/src/main/java/hudson/tasks/BatchFile.java
@@ -26,6 +26,7 @@ package hudson.tasks;
 import hudson.FilePath;
 import hudson.Extension;
 import hudson.model.Descriptor;
+import hudson.model.AbstractProject;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
 
@@ -52,7 +53,7 @@ public class BatchFile extends CommandInterpreter {
     }
 
     @Extension
-    public static final class DescriptorImpl extends Descriptor<Builder> {
+    public static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
         public String getHelpFile() {
             return "/help/project-config/batch.html";
         }
@@ -64,5 +65,9 @@ public class BatchFile extends CommandInterpreter {
         public Builder newInstance(StaplerRequest req, JSONObject data) {
             return new BatchFile(data.getString("batchFile"));
         }
+
+        public boolean isApplicable(Class<? extends AbstractProject> jobType) {
+            return true;
+        }
     }
 }
diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java
index fe31bcc7780f6ffbfc549fdceffd018a26db8332..55558d8ea2b4029a77718cb62964fb1e393995bc 100644
--- a/core/src/main/java/hudson/tasks/Maven.java
+++ b/core/src/main/java/hudson/tasks/Maven.java
@@ -272,7 +272,7 @@ public class Maven extends Builder {
     public static DescriptorImpl DESCRIPTOR;
 
     @Extension
-    public static final class DescriptorImpl extends Descriptor<Builder> {
+    public static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
         @CopyOnWrite
         private volatile MavenInstallation[] installations = new MavenInstallation[0];
 
@@ -281,6 +281,10 @@ public class Maven extends Builder {
             load();
         }
 
+        public boolean isApplicable(Class<? extends AbstractProject> jobType) {
+            return true;
+        }
+
         protected void convert(Map<String, Object> oldPropertyBag) {
             if(oldPropertyBag.containsKey("installations"))
                 installations = (MavenInstallation[]) oldPropertyBag.get("installations");
diff --git a/core/src/main/java/hudson/tasks/Shell.java b/core/src/main/java/hudson/tasks/Shell.java
index 285a852aa715d998645b40fda3049e2b86cb8cab..17a4eb6b854e9ebc82cfd3eeea46416698dbce94 100644
--- a/core/src/main/java/hudson/tasks/Shell.java
+++ b/core/src/main/java/hudson/tasks/Shell.java
@@ -27,6 +27,7 @@ import hudson.FilePath;
 import hudson.Util;
 import hudson.Extension;
 import hudson.model.Descriptor;
+import hudson.model.AbstractProject;
 import static hudson.model.Hudson.isWindows;
 import hudson.util.FormFieldValidator;
 import net.sf.json.JSONObject;
@@ -99,7 +100,7 @@ public class Shell extends CommandInterpreter {
     }
 
     @Extension
-    public static final class DescriptorImpl extends Descriptor<Builder> {
+    public static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
         /**
          * Shell executable, or null to default.
          */
@@ -109,6 +110,10 @@ public class Shell extends CommandInterpreter {
             load();
         }
 
+        public boolean isApplicable(Class<? extends AbstractProject> jobType) {
+            return true;
+        }
+
         protected void convert(Map<String, Object> oldPropertyBag) {
             shell = (String)oldPropertyBag.get("shell");
         }