diff --git a/History.md b/History.md
index 4b2dbdca8d..3de732487e 100644
--- a/History.md
+++ b/History.md
@@ -17,7 +17,9 @@
 
 * Fix Mongo queries which nested JavaScript RegExp objects inside `$or`.  #1089
 
-* Upgrade Underscore from 1.4.2 to 1.4.4.
+* Upgrade Underscore from 1.4.2 to 1.4.4.  #776
+
+* Upgrade http-proxy from 0.8.5 to 0.10.1.  #513
 
 * Upgrade Connect from 1.9.2 to 2.7.10.
 
diff --git a/meteor b/meteor
index 16aa2a0641..eefa2949df 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.5
+BUNDLE_VERSION=0.3.6
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 724a9d2b18..ecd274ad7e 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -103,7 +103,7 @@ npm install clean-css@0.8.3
 npm install useragent@2.0.1
 npm install request@2.12.0
 npm install keypress@0.1.0
-npm install http-proxy@0.8.5
+npm install http-proxy@0.10.1  # not 0.10.2, which contains a sketchy websocket change
 npm install underscore@1.4.4
 npm install fstream@0.1.21
 npm install tar@0.1.14