diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 8b84f09000..f18f560a7c 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -1199,9 +1199,22 @@ public final class FilePath implements Serializable {
      *      can be empty but always non-null.
      */
     public FilePath[] list(final String includes) throws IOException, InterruptedException {
+        return list(includes, null);
+    }
+
+    /**
+     * List up files in this directory that matches the given Ant-style filter.
+     *
+     * @param includes
+     * @param excludes
+     *      See {@link FileSet} for the syntax. String like "foo/*.zip" or "foo/**/*.xml"
+     * @return
+     *      can be empty but always non-null.
+     */
+    public FilePath[] list(final String includes, final String excludes) throws IOException, InterruptedException {
         return act(new FileCallable<FilePath[]>() {
             public FilePath[] invoke(File f, VirtualChannel channel) throws IOException {
-                String[] files = glob(f,includes);
+                String[] files = glob(f,includes,excludes);
 
                 FilePath[] r = new FilePath[files.length];
                 for( int i=0; i<r.length; i++ )
@@ -1218,10 +1231,10 @@ public final class FilePath implements Serializable {
      * @return
      *      A set of relative file names from the base directory.
      */
-    private static String[] glob(File dir, String includes) throws IOException {
+    private static String[] glob(File dir, String includes, String excludes) throws IOException {
         if(isAbsolute(includes))
             throw new IOException("Expecting Ant GLOB pattern, but saw '"+includes+"'. See http://ant.apache.org/manual/Types/fileset.html for syntax");
-        FileSet fs = Util.createFileSet(dir,includes);
+        FileSet fs = Util.createFileSet(dir,includes,excludes);
         DirectoryScanner ds = fs.getDirectoryScanner(new Project());
         String[] files = ds.getIncludedFiles();
         return files;
diff --git a/core/src/test/java/hudson/FilePathTest.java b/core/src/test/java/hudson/FilePathTest.java
index df82a2403b..ff44f455a3 100644
--- a/core/src/test/java/hudson/FilePathTest.java
+++ b/core/src/test/java/hudson/FilePathTest.java
@@ -23,7 +23,6 @@
  */
 package hudson;
 
-import hudson.remoting.Future;
 import hudson.remoting.VirtualChannel;
 import hudson.util.IOException2;
 import hudson.util.NullStream;
@@ -33,12 +32,15 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.apache.commons.io.output.CountingOutputStream;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.output.NullOutputStream;
 import org.jvnet.hudson.test.Bug;
 
@@ -255,4 +257,44 @@ public class FilePathTest extends ChannelTestCase {
         assertEquals("C:\\", (fp = fp.getParent()).getRemote());
         assertNull(fp.getParent());
     }
+
+    private FilePath createFilePath(final File base, final String... path) throws IOException {
+        File building = base;
+        for (final String component : path) {
+            building = new File(building, component);
+        }
+        FileUtils.touch(building);
+        return new FilePath(building);
+    }
+
+    public void testList() throws Exception {
+        File baseDir = Util.createTempDir();
+        try {
+            final Set<FilePath> expected = new HashSet<FilePath>();
+            expected.add(createFilePath(baseDir, "top", "sub", "app.log"));
+            expected.add(createFilePath(baseDir, "top", "sub", "trace.log"));
+            expected.add(createFilePath(baseDir, "top", "db", "db.log"));
+            expected.add(createFilePath(baseDir, "top", "db", "trace.log"));
+            final FilePath[] result = new FilePath(baseDir).list("**");
+            assertEquals(expected, new HashSet<FilePath>(Arrays.asList(result)));
+        } finally {
+            Util.deleteRecursive(baseDir);
+        }
+    }
+
+    public void testListWithExcludes() throws Exception {
+        File baseDir = Util.createTempDir();
+        try {
+            final Set<FilePath> expected = new HashSet<FilePath>();
+            expected.add(createFilePath(baseDir, "top", "sub", "app.log"));
+            createFilePath(baseDir, "top", "sub", "trace.log");
+            expected.add(createFilePath(baseDir, "top", "db", "db.log"));
+            createFilePath(baseDir, "top", "db", "trace.log");
+            final FilePath[] result = new FilePath(baseDir).list("**", "**/trace.log");
+            assertEquals(expected, new HashSet<FilePath>(Arrays.asList(result)));
+        } finally {
+            Util.deleteRecursive(baseDir);
+        }
+    }
+
 }