diff --git a/VERSION.txt b/VERSION.txt
index c80a6bbae89..1ed025e9910 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,6 +1,7 @@
 jetty-7.1.5-SNAPSHOT
  + 311550 The WebAppProvider should allow setTempDirectory
  + 316449 Websocket disconnect fix
+ + 316584 Exception on startup if temp path has spaces and extractWAR=false
 
 jetty-7.1.4.v20100610
  + 298551 SslSocketConnector does not need keystore stream
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
index cdf896c99dd..922952ac150 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
@@ -508,7 +508,7 @@ public class WebInfConfiguration implements Configuration
                 web_inf_classes.copyTo(webInfClassesDir);
             }
             
-            web_inf=Resource.newResource(extractedWebInfDir.toURL());
+            web_inf=Resource.newResource(extractedWebInfDir.getCanonicalPath());
             
             ResourceCollection rc = new ResourceCollection(new Resource[]{web_inf,web_app});