diff --git a/core/src/main/java/hudson/FileSystemProvisioner.java b/core/src/main/java/hudson/FileSystemProvisioner.java
index d69a2ffa45..e37f81acd1 100644
--- a/core/src/main/java/hudson/FileSystemProvisioner.java
+++ b/core/src/main/java/hudson/FileSystemProvisioner.java
@@ -204,7 +204,7 @@ public abstract class FileSystemProvisioner implements ExtensionPoint, Describab
             File wss = new File(build.getRootDir(),"workspace.zip");
             OutputStream os = new BufferedOutputStream(new FileOutputStream(wss));
             try {
-                ws.createZipArchive(os);
+                ws.zip(os);
             } finally {
                 os.close();
             }
diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
index 31fac92f18..c1b81146cd 100644
--- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
+++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
@@ -199,7 +199,7 @@ public final class DirectoryBrowserSupport implements HttpResponse {
         if(baseFile.isDirectory()) {
             if(zip) {
                 rsp.setContentType("application/zip");
-                baseFile.createZipArchive(rsp.getOutputStream(),rest);
+                baseFile.zip(rsp.getOutputStream(),rest);
                 return;
             }
             if (plain) {