diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24aa3c464..4333119f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,25 +2,38 @@
 emqttd ChangeLog
 ==================
 
-0.8.0 (2015-05-10)
+0.7.0-alpha (2015-05-01)
 -------------------------
 
-Presence Management....
+[MQTT over WebSocket(SSL)](https://github.com/emqtt/emqttd/wiki/MQTT-Over-WebSocket) Now!
 
-0.7.1-alpha (2015-05-05)
--------------------------
+A slimple [Plugin Achitecture](https://github.com/emqtt/emqttd/wiki/Plugin%20Design) based on OTP appliation
 
-Bugfix
+[Trace MQTT Packets or Messages](https://github.com/emqtt/emqttd/wiki/Trace%20Design) to log files
 
+Feature: issue #40, #115 - WebSocket/SSL Support
 
-0.7.0-alpha (2015-04-20)
--------------------------
+Feature: issue #49, #105 - Plugin Architecture Support
 
-OK Trace API
+Feature: issue #93 - Trace API Design
 
-OK Plugin Load/Unload
+Improve: issue #109 - emqttd_broker should add subscribe, notify API 
 
-WebSocket
+Improve: update README.md to add 'Goals', 'Contributors' chapters
+
+Change: rename etc/app.config to etc/emqttd.config
+
+Change: etc/emqttd.config changed
+
+Bugfix: critical issue #54 - error when resume session!
+ 
+Bugfix: issue #118 - error report when UNSUBSCRIBE with no topics
+
+Bugfix: issue #117 - sys_interval = 0 config cannot work
+
+Bugfix: issue #112 - Makefile to support build plugins
+
+Bugfix: issue #96 - "make clean" cannot work
 
 
 0.6.2-alpha (2015-04-24)
diff --git a/README.md b/README.md
index 16c224d03..74bf6e481 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ emqttd aims to provide a solid, enterprise grade open-source MQTT broker that co
 
 ## QuickStart
 
-Download binary packeges for linux, mac and freebsd from [http://emqtt.io/downloads](http://emqtt.io/downloads). And then:
+Download binary packeges for linux, mac and freebsd from [http://emqtt.io/downloads](http://emqtt.io/downloads).
 
 ```
 tar xvf emqttd-ubuntu64-0.7.0-alpha.tgz && cd emqttd
@@ -60,7 +60,7 @@ git clone https://github.com/emqtt/emqttd.git
 cd emqttd && make && make dist
 ```
 
-## GettingStart
+## GetStarted
 
 Read [GettingStarted](https://github.com/emqtt/emqttd/wiki/GettingStarted) for more installation and configuration guide.
 
@@ -76,9 +76,11 @@ The MIT License (MIT)
 
 ## Contributors
 
-* @hejin1026 <260495915 at qq.com>
-* @desoulter <assoulter123 at gmail.com>
-* @turtleDeng
+@hejin1026 <260495915 at qq.com>
+
+@desoulter <assoulter123 at gmail.com>
+
+@turtleDeng
 
 ## Author
 
diff --git a/TODO b/TODO
index bd5cec5b9..6b39dca41 100644
--- a/TODO
+++ b/TODO
@@ -1,22 +1,30 @@
 
+v0.9.0-alpha (2015-05-30)
+-------------------------
+
+
 v0.8.0-alpha (2015-05-10)
 -------------------------
 
+Documents...
+
 MySQL Auth
 
 Dashboard
 
 AMQP
 
-README.md: add "Supports and Contact" include IRC,  mailling-list, email.
+Bridge Test
 
 
-v0.6.0-alpha (2015-03-20)
+0.8.0 (2015-05-10)
 -------------------------
 
-Plugin Architecture
+Presence Management....
 
-Mnesia Authentication
+Force Subscription...
+
+Point2Point Queue...
 
 MySQL Auth
 
@@ -24,32 +32,19 @@ LDAP Auth
 
 PG Auth
 
-Mnesia ACL
-
 MySQL ACL
 
 Retained Message...
 
-0.6.0
-=====
-
 Tsung MQTT Test
 
-v0.9.0-alpha (2015-03-20)
+
+0.7.1-alpha (2015-05-05)
 -------------------------
 
-emqtt_sm, emqtt_cm, emqtt_pubsub performance issue...
-
-v0.8.0-alpha (2015-03-20)
--------------------------
-
-MQTT/WebSocket
-
-v0.7.0-alpha (2015-03-20)
--------------------------
-
-Admin Console
+Bugfix
 
+Admin Dashboard
 
 one million connections test...
 
@@ -59,15 +54,6 @@ Dialyzer ...
 
 full test cases...
 
-spawn_link to replace 'spawn' and 'link'
-
-=======
-
-## Bridge
-
-## Websocket
-
-## MQTT over Websocket
-
-## Mnesia 
+README.md: add "Supports and Contact" include IRC,  mailling-list, email.
 
+Document