diff --git a/externals/javelin b/externals/javelin
index d9a1cb4c16..7ac64cd03d 160000
--- a/externals/javelin
+++ b/externals/javelin
@@ -1 +1 @@
-Subproject commit d9a1cb4c16866aec38f062eee9f3d2129c885b62
+Subproject commit 7ac64cd03d89d6d5f8c7f85b32c9611d3866ea2b
diff --git a/webroot/rsrc/js/application/core/ShapedRequest.js b/webroot/rsrc/js/application/core/ShapedRequest.js
index d993e6680a..dd03b30def 100644
--- a/webroot/rsrc/js/application/core/ShapedRequest.js
+++ b/webroot/rsrc/js/application/core/ShapedRequest.js
@@ -61,7 +61,7 @@ JX.install('PhabricatorShapedRequest', {
           this._request = null;
         }));
         request.setData(data);
-        request.setTimeout(this.getFrequency());
+        request.setTimeout(this.getRequestTimeout());
         request.send();
       } else {
         this._defer = JX.defer(
@@ -87,6 +87,7 @@ JX.install('PhabricatorShapedRequest', {
 
   properties : {
     rateLimit : 500,
-    frequency : 1000
+    frequency : 1000,
+    requestTimeout : 20000
   }
 });