diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index dfc0514..497680d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+=== 0.4.0 / 2012-02-13
+
+* Add ping() method to server-side WebSocket and EventSource
+* Buffer send() calls until the draft-76 handshake is complete
+* Fix HTTPS problems on Node 0.7
+
+
 === 0.3.1 / 2012-01-16
 
 * Call setNoDelay(true) on net.Socket objects to reduce latency
diff --git a/package.json b/package.json
index f8ca71e..e1e1cfd 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
 , "author"          : "James Coglan <jcoglan@gmail.com> (http://jcoglan.com/)"
 , "keywords"        : ["websocket", "eventsource"]
 
-, "version"         : "0.3.1"
+, "version"         : "0.4.0"
 , "engines"         : {"node": ">=0.4.0"}
 , "main"            : "./lib/faye/websocket"
 , "devDependencies" : {"jsclass": ""}