--- old/src/java.httpclient/share/classes/java/net/http/HttpResponse.java	2016-04-25 23:10:18.485374890 +0100
+++ new/src/java.httpclient/share/classes/java/net/http/HttpResponse.java	2016-04-25 23:10:16.905374914 +0100
@@ -727,11 +727,14 @@
             }
 
             private CompletableFuture<Path> getBody(HttpRequest req,
-                                                    CompletableFuture<HttpResponse> cf) {
+                                                    CompletableFuture<? extends HttpResponse> cf) {
                 URI u = req.uri();
                 String path = u.getPath();
+                if (path.startsWith("/"))
+                    path = path.substring(1);
+                final String fpath = path;
                 return cf.thenCompose((HttpResponse resp) -> {
-                    return resp.bodyAsync(HttpResponse.asFile(destination.resolve(path)));
+                    return resp.bodyAsync(HttpResponse.asFile(destination.resolve(fpath)));
                 });
             }