diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 50ec1a1249..d9e32f4ebf 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -204,6 +204,45 @@ public final class FilePath implements Serializable {
         });
     }
 
+    /**
+     * Creates a zip file from this directory by only including the files that match the given glob.
+     *
+     * @param glob
+     *      Ant style glob, like "**/*.xml". If empty or null, this method
+     *      works like {@link #createZipArchive(OutputStream)}
+     *
+     * @since 1.129
+     */
+    public void createZipArchive(OutputStream os, final String glob) throws IOException, InterruptedException {
+        if(glob==null || glob.length()==0) {
+            createZipArchive(os);
+            return;
+        }
+        
+        final OutputStream out = (channel!=null)?new RemoteOutputStream(os):os;
+        act(new FileCallable<Void>() {
+            public Void invoke(File dir, VirtualChannel channel) throws IOException {
+                byte[] buf = new byte[8192];
+
+                ZipOutputStream zip = new ZipOutputStream(out);
+                for( String entry : glob(dir,glob) ) {
+                    zip.putNextEntry(new ZipEntry(dir.getName()+'/'+entry));
+                    FileInputStream in = new FileInputStream(new File(dir,entry));
+                    int len;
+                    while((len=in.read(buf))>0)
+                        zip.write(buf,0,len);
+                    in.close();
+                    zip.closeEntry();
+                }
+
+                zip.close();
+                return null;
+            }
+
+            private static final long serialVersionUID = 1L;
+        });
+    }
+
     /**
      * Code that gets executed on the machine where the {@link FilePath} is local.
      * Used to act on {@link FilePath}.
@@ -458,6 +497,8 @@ public final class FilePath implements Serializable {
     
     /**
      * Returns the file size in bytes.
+     *
+     * @since 1.129
      */
     public long length() throws IOException, InterruptedException {
         return act(new FileCallable<Long>() {
@@ -502,12 +543,7 @@ public final class FilePath implements Serializable {
     public FilePath[] list(final String includes) throws IOException, InterruptedException {
         return act(new FileCallable<FilePath[]>() {
             public FilePath[] invoke(File f, VirtualChannel channel) throws IOException {
-                FileSet fs = new FileSet();
-                fs.setDir(f);
-                fs.setIncludes(includes);
-
-                DirectoryScanner ds = fs.getDirectoryScanner(new org.apache.tools.ant.Project());
-                String[] files = ds.getIncludedFiles();
+                String[] files = glob(f,includes);
 
                 FilePath[] r = new FilePath[files.length];
                 for( int i=0; i<r.length; i++ )
@@ -518,6 +554,19 @@ public final class FilePath implements Serializable {
         });
     }
 
+    /**
+     * Runs Ant glob expansion.
+     */
+    private static String[] glob(File dir, String includes) {
+        FileSet fs = new FileSet();
+        fs.setDir(dir);
+        fs.setIncludes(includes);
+
+        DirectoryScanner ds = fs.getDirectoryScanner(new Project());
+        String[] files = ds.getIncludedFiles();
+        return files;
+    }
+
     /**
      * Reads this file.
      */
diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
index dfe9c0b8fa..b89e838716 100644
--- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
+++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
@@ -120,7 +120,7 @@ public final class DirectoryBrowserSupport {
         if(baseFile.isDirectory()) {
             if(zip) {
                 rsp.setContentType("application/zip");
-                baseFile.createZipArchive(rsp.getOutputStream());
+                baseFile.createZipArchive(rsp.getOutputStream(),rest);
                 return;
             }
 
@@ -149,6 +149,7 @@ public final class DirectoryBrowserSupport {
                 req.setAttribute("it", this);
                 List<Path> parentPaths = buildParentPath(base,restSize);
                 req.setAttribute("parentPath",parentPaths);
+                req.setAttribute("backPath", createBackRef(restSize));
                 req.setAttribute("topPath", createBackRef(parentPaths.size()+restSize));
                 req.setAttribute("files", baseFile.act(glob));
                 req.setAttribute("icon", icon);
diff --git a/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly b/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly
index 4d8ff7f61f..860b8a718c 100644
--- a/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly
+++ b/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly
@@ -6,7 +6,7 @@
       <div class="dirTree">
       <!-- parent path -->
         <div class="parentPath">
-          <form action="." method="get">
+          <form action="${backPath}" method="get">
             <a href="${topPath}"><img src="${imagesURL}/48x48/${icon}" class="rootIcon" /></a>
             <j:forEach var="p" items="${parentPath}">
               <a href="${p.href}">${p.title}</a>