diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6faf9368..384dea81b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,30 @@
 eMQTTD ChangeLog
 ==================
 
+0.5.4-alpha (2015-03-22)
+-------------------------
+
+Benchmark this release on a ubuntu/14.04 server with 8 cores, 32G memory from QingCloud.com:
+
+```
+200K Connections,
+30K Messages/Sec,
+20Mbps In/Out Traffic,
+200K Topics,
+200K Subscribers,
+
+Consumed 7G memory, 40% CPU/core
+```
+
+Benchmark code: https://github.com/emqtt/emqttd_benchmark
+
+Change: rewrite emqttd_pubsub to handle more concurrent subscribe requests.
+
+Change: ./bin/emqttd_ctl add 'stats', 'metrics' commands.
+
+Bugfix: issue #71, #72
+
+
 0.5.3-alpha (2015-03-19)
 -------------------------
 
diff --git a/apps/emqttd/src/emqttd.app.src b/apps/emqttd/src/emqttd.app.src
index 2b78e3bdb..3c0bbd24c 100644
--- a/apps/emqttd/src/emqttd.app.src
+++ b/apps/emqttd/src/emqttd.app.src
@@ -1,7 +1,7 @@
 {application, emqttd,
  [
   {description, "Erlang MQTT Broker"},
-  {vsn, "0.5.3"},
+  {vsn, "0.5.4"},
   {modules, []},
   {registered, []},
   {applications, [kernel,