diff --git a/core/pom.xml b/core/pom.xml
index 1934476463bc62b9803090e76b4557d3f31a3597..399844ea9c54803b832b50ca2e55f30e7daafa76 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -707,6 +707,12 @@ THE SOFTWARE.
       <artifactId>jinterop-wmi</artifactId>
       <version>1.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.kohsuke.metainf-services</groupId>
+      <artifactId>metainf-services</artifactId>
+      <version>1.1</version>
+      <optional>true</optional>
+    </dependency>
 
     <!-- offline profiler API to put in the classpath if we need it -->
     <!--dependency>
diff --git a/core/src/main/java/hudson/cli/CLICommand.java b/core/src/main/java/hudson/cli/CLICommand.java
index 56ece76bd5b469c7b0d4695ac42582b8faa95748..f9b910fe498e4ec784ce26e22c994300e566d7f8 100644
--- a/core/src/main/java/hudson/cli/CLICommand.java
+++ b/core/src/main/java/hudson/cli/CLICommand.java
@@ -32,6 +32,13 @@ import hudson.remoting.Callable;
 import hudson.model.Hudson;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.CmdLineException;
+import org.kohsuke.args4j.spi.OptionHandler;
+import org.jvnet.tiger_types.Types;
+import org.apache.commons.discovery.resource.classes.DiscoverClasses;
+import org.apache.commons.discovery.resource.ClassLoaders;
+import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
+import org.apache.commons.discovery.ResourceClassIterator;
+import org.apache.commons.discovery.ResourceNameIterator;
 
 import java.io.PrintStream;
 import java.io.InputStream;
@@ -196,4 +203,21 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable {
         }
         return null;
     }
+
+    static {
+        // register option handlers that are defined
+        ClassLoaders cls = new ClassLoaders();
+        cls.put(Hudson.getInstance().getPluginManager().uberClassLoader);
+
+        ResourceNameIterator servicesIter =
+            new DiscoverServiceNames(cls).findResourceNames(OptionHandler.class.getName());
+        final ResourceClassIterator itr =
+            new DiscoverClasses(cls).findResourceClasses(servicesIter);
+
+        while(itr.hasNext()) {
+            Class h = itr.nextResourceClass().loadClass();
+            Class c = Types.erasure(Types.getTypeArgument(Types.getBaseClass(h, OptionHandler.class), 0));
+            CmdLineParser.registerHandler(c,h);
+        }
+    }
 }
diff --git a/core/src/main/java/hudson/cli/CopyJobCommand.java b/core/src/main/java/hudson/cli/CopyJobCommand.java
index 05a89d9079f798d2f780d1e49fdadd4f3aac8951..371f1380686018ad6db85052e479a6a1b03b7ff0 100644
--- a/core/src/main/java/hudson/cli/CopyJobCommand.java
+++ b/core/src/main/java/hudson/cli/CopyJobCommand.java
@@ -37,31 +37,26 @@ import java.io.Serializable;
  * @author Kohsuke Kawaguchi
  */
 @Extension
-public class CopyJobCommand extends CLICommand implements Serializable {
+public class CopyJobCommand extends CLICommand {
     @Override
     public String getShortDescription() {
         return "Copies a job";
     }
 
     @Argument(metaVar="SRC",usage="Name of the job to copy")
-    public String src;
+    public TopLevelItem src;
 
     @Argument(metaVar="DST",usage="Name of the new job to be created.",index=1)
     public String dst;
 
     protected int run() throws Exception {
         Hudson h = Hudson.getInstance();
-        TopLevelItem s = h.getItem(src);
-        if (s==null) {
-            stderr.println("No such job '"+src+"' perhaps you meant "+ AbstractProject.findNearest(src)+"?");
-            return -1;
-        }
         if (h.getItem(dst)!=null) {
             stderr.println("Job '"+dst+"' already exists");
             return -1;
         }
         
-        h.copy(s,dst);
+        h.copy(src,dst);
         return 0;
     }
 }
diff --git a/core/src/main/java/hudson/cli/DeleteJobCommand.java b/core/src/main/java/hudson/cli/DeleteJobCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..1dfe6c03277227c92e1123b62de6734b5525ee4b
--- /dev/null
+++ b/core/src/main/java/hudson/cli/DeleteJobCommand.java
@@ -0,0 +1,49 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004-2009, Sun Microsystems, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.cli;
+
+import hudson.model.TopLevelItem;
+import hudson.Extension;
+import org.kohsuke.args4j.Argument;
+
+/**
+ * Deletes a job.
+ * @author Kohsuke Kawaguchi
+ */
+@Extension
+public class DeleteJobCommand extends CLICommand {
+    @Override
+    public String getShortDescription() {
+        return "Deletes a job";
+    }
+
+    @Argument
+    public TopLevelItem job;
+
+    protected int run() throws Exception {
+        job.delete();
+        return 0;
+    }
+}
+
diff --git a/core/src/main/java/hudson/cli/DisableJobCommand.java b/core/src/main/java/hudson/cli/DisableJobCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..29bb6bb2d9efe0ce39720d47eac1a479f7e9df33
--- /dev/null
+++ b/core/src/main/java/hudson/cli/DisableJobCommand.java
@@ -0,0 +1,25 @@
+package hudson.cli;
+
+import hudson.Extension;
+import hudson.model.AbstractProject;
+import org.kohsuke.args4j.Argument;
+
+/**
+ * Disables a job.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@Extension
+public class DisableJobCommand extends CLICommand {
+    @Argument
+    public AbstractProject src;
+
+    public String getShortDescription() {
+        return "Disables a job";
+    }
+
+    protected int run() throws Exception {
+        src.makeDisabled(true);
+        return 0;
+    }
+}
diff --git a/core/src/main/java/hudson/cli/EnableJobCommand.java b/core/src/main/java/hudson/cli/EnableJobCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..45986984edad07b705e9cc06f9e1c8e829711f24
--- /dev/null
+++ b/core/src/main/java/hudson/cli/EnableJobCommand.java
@@ -0,0 +1,25 @@
+package hudson.cli;
+
+import hudson.Extension;
+import hudson.model.AbstractProject;
+import org.kohsuke.args4j.Argument;
+
+/**
+ * Enables a job.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@Extension
+public class EnableJobCommand extends CLICommand {
+    @Argument
+    public AbstractProject src;
+
+    public String getShortDescription() {
+        return "Enables a previously disabled job";
+    }
+
+    protected int run() throws Exception {
+        src.makeDisabled(false);
+        return 0;
+    }
+}
diff --git a/core/src/main/java/hudson/cli/handlers/AbstractProjectOptionHandler.java b/core/src/main/java/hudson/cli/handlers/AbstractProjectOptionHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..f3bde0fb13dc51524018ec7dd5067d2a3c127425
--- /dev/null
+++ b/core/src/main/java/hudson/cli/handlers/AbstractProjectOptionHandler.java
@@ -0,0 +1,63 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004-2009, Sun Microsystems, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.cli.handlers;
+
+import hudson.model.AbstractProject;
+import hudson.model.Hudson;
+import org.kohsuke.args4j.CmdLineException;
+import org.kohsuke.args4j.CmdLineParser;
+import org.kohsuke.args4j.OptionDef;
+import org.kohsuke.args4j.spi.OptionHandler;
+import org.kohsuke.args4j.spi.Parameters;
+import org.kohsuke.args4j.spi.Setter;
+import org.kohsuke.MetaInfServices;
+
+/**
+ * Refer to {@link AbstractProject} by its name.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@MetaInfServices
+public class AbstractProjectOptionHandler extends OptionHandler<AbstractProject> {
+    public AbstractProjectOptionHandler(CmdLineParser parser, OptionDef option, Setter<AbstractProject> setter) {
+        super(parser, option, setter);
+    }
+
+    @Override
+    public int parseArguments(Parameters params) throws CmdLineException {
+        Hudson h = Hudson.getInstance();
+        String src = params.getParameter(0);
+
+        AbstractProject s = h.getItemByFullName(src,AbstractProject.class);
+        if (s==null)
+            throw new CmdLineException("No such job '"+src+"' perhaps you meant "+ AbstractProject.findNearest(src)+"?");
+        setter.addValue(s);
+        return 1;
+    }
+
+    @Override
+    public String getDefaultMetaVariable() {
+        return "JOB";
+    }
+}
diff --git a/core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java b/core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..9206816e8777db8b6d2c0064b43c2f55b2e39fa1
--- /dev/null
+++ b/core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java
@@ -0,0 +1,41 @@
+package hudson.cli.handlers;
+
+import hudson.model.AbstractProject;
+import hudson.model.Hudson;
+import hudson.model.TopLevelItem;
+import org.kohsuke.MetaInfServices;
+import org.kohsuke.args4j.CmdLineException;
+import org.kohsuke.args4j.CmdLineParser;
+import org.kohsuke.args4j.OptionDef;
+import org.kohsuke.args4j.spi.OptionHandler;
+import org.kohsuke.args4j.spi.Parameters;
+import org.kohsuke.args4j.spi.Setter;
+
+/**
+ * Refers to {@link TopLevelItem} by its name.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@MetaInfServices
+public class TopLevelItemOptionHandler extends OptionHandler<TopLevelItem> {
+    public TopLevelItemOptionHandler(CmdLineParser parser, OptionDef option, Setter<TopLevelItem> setter) {
+        super(parser, option, setter);
+    }
+
+    @Override
+    public int parseArguments(Parameters params) throws CmdLineException {
+        Hudson h = Hudson.getInstance();
+        String src = params.getParameter(0);
+
+        TopLevelItem s = h.getItem(src);
+        if (s==null)
+            throw new CmdLineException("No such job '"+src+"' perhaps you meant "+ AbstractProject.findNearest(src)+"?");
+        setter.addValue(s);
+        return 1;
+    }
+
+    @Override
+    public String getDefaultMetaVariable() {
+        return "JOB";
+    }
+}
diff --git a/core/src/main/java/hudson/cli/handlers/package-info.java b/core/src/main/java/hudson/cli/handlers/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..982ac6b4ec4342f526b727c15ceda7d9954ddf8f
--- /dev/null
+++ b/core/src/main/java/hudson/cli/handlers/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * {@link OptionHandler} implementations for Hudson.
+ */
+package hudson.cli.handlers;
+
+import org.kohsuke.args4j.spi.OptionHandler;
\ No newline at end of file
diff --git a/core/src/main/java/hudson/model/Item.java b/core/src/main/java/hudson/model/Item.java
index 428023226def8171be5e0c05372473ec5fa86385..39ec2328d1918a59d0cb7f2d2e14db13ae3da9b2 100644
--- a/core/src/main/java/hudson/model/Item.java
+++ b/core/src/main/java/hudson/model/Item.java
@@ -186,6 +186,11 @@ public interface Item extends PersistenceRoot, SearchableModelObject, AccessCont
      */
     public void save() throws IOException;
 
+    /**
+     * Deletes this item.
+     */
+    public void delete() throws IOException, InterruptedException;
+
     public static final PermissionGroup PERMISSIONS = new PermissionGroup(Item.class,Messages._Item_Permissions_Title());
     public static final Permission CREATE = new Permission(PERMISSIONS,"Create", Permission.CREATE);
     public static final Permission DELETE = new Permission(PERMISSIONS,"Delete", Permission.DELETE);