diff --git a/History.md b/History.md
index d1f4c479d3a..66eaf71438b 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,8 @@
 
 ## vNEXT
 
+## v0.3.7
+
 * Better parsing of `.html` template files
   * Allow HTML comments (`<!-- -->`) at top level
   * Allow whitespace anywhere in open/close tag
@@ -14,13 +16,16 @@
 * `http` package bug fixes:
   * Send correct Content-Type when POSTing `params` from the server. #172
   * Correctly detect JSON response Content-Type when a charset is present.
-  
+
 * Support `Handlebars.SafeString`. #160
 
 * Fix intermittent "Cursor is closed" mongo error.
 
 * Fix "Cannot read property 'nextSibling' of null" error in certain nested templates. #142
 
+* Add heartbeat timer on the client to notice when the server silently goes away.
+
+
 ## v0.3.6
 
 * Rewrite event handling. `this` in event handlers now refers to the data context of the element that generated the event, *not* the top-level data context of the template where the event is declared.
@@ -34,7 +39,6 @@
 * Update node.js to 0.6.17 to fix potential security issue.
 
 
-
 ## v0.3.5
 
 * Fix 0.3.4 regression: Call event map handlers on bubbled events. #107
diff --git a/admin/debian/changelog b/admin/debian/changelog
index 1ea3c395114..3585a6e5267 100644
--- a/admin/debian/changelog
+++ b/admin/debian/changelog
@@ -1,4 +1,4 @@
-meteor (0.3.6-1) unstable; urgency=low
+meteor (0.3.7-1) unstable; urgency=low
 
   * Automated debian build.
 
diff --git a/admin/install-s3.sh b/admin/install-s3.sh
index 994685c0ea0..d3468de107c 100755
--- a/admin/install-s3.sh
+++ b/admin/install-s3.sh
@@ -5,7 +5,7 @@
 ## example.
 
 URLBASE="http://d3sqy0vbqsdhku.cloudfront.net"
-VERSION="0.3.6"
+VERSION="0.3.7"
 PKGVERSION="${VERSION}-1"
 
 UNAME=`uname`
diff --git a/admin/manifest.json b/admin/manifest.json
index d7451a4da73..243437fdd09 100644
--- a/admin/manifest.json
+++ b/admin/manifest.json
@@ -1,8 +1,8 @@
 {
-  "version": "0.3.6",
-  "url": "https://d3sqy0vbqsdhku.cloudfront.net/meteor-package-Darwin-x86_64-0.3.6.tar.gz",
+  "version": "0.3.7",
+  "url": "https://d3sqy0vbqsdhku.cloudfront.net/meteor-package-Darwin-x86_64-0.3.7.tar.gz",
 
-  "deb_version": "0.3.6-1",
-  "rpm_version": "0.3.6-1",
+  "deb_version": "0.3.7-1",
+  "rpm_version": "0.3.7-1",
   "urlbase": "https://d3sqy0vbqsdhku.cloudfront.net"
 }
diff --git a/admin/meteor.spec b/admin/meteor.spec
index 8d7fceebde0..81b3d0c68c3 100644
--- a/admin/meteor.spec
+++ b/admin/meteor.spec
@@ -5,7 +5,7 @@
 Summary: Meteor platform and JavaScript application server
 Vendor: Meteor
 Name: meteor
-Version: 0.3.6
+Version: 0.3.7
 Release: 1
 License: MIT
 Group: Networking/WWW
diff --git a/app/lib/updater.js b/app/lib/updater.js
index 29b2e307afb..3a0487035cd 100644
--- a/app/lib/updater.js
+++ b/app/lib/updater.js
@@ -1,4 +1,4 @@
-exports.CURRENT_VERSION = "0.3.6";
+exports.CURRENT_VERSION = "0.3.7";
 
 var fs = require("fs");
 var http = require("http");
diff --git a/docs/client/docs.html b/docs/client/docs.html
index d07ccc8a792..552f9837f4f 100644
--- a/docs/client/docs.html
+++ b/docs/client/docs.html
@@ -11,7 +11,7 @@
   </div>
   <div id="main">
     <div id="top"></div>
-    <h2 class="main-headline">Meteor 0.3.6</h1>
+    <h2 class="main-headline">Meteor 0.3.7</h1>
     {{> introduction }}
     {{> concepts }}
     {{> api }}
diff --git a/docs/client/docs.js b/docs/client/docs.js
index 74fba51f500..72dc4091a18 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -1,4 +1,4 @@
-METEOR_VERSION = "0.3.6";
+METEOR_VERSION = "0.3.7";
 
 Meteor.startup(function () {
   // XXX this is broken by the new multi-page layout.  Also, it was