diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5586ce12..3c604bf61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ emqttd ChangeLog
 0.9.0-alpha (2015-06-14)
 -------------------------
 
+Session and Queue
+
+Merge emqtt, emqttd apps
+
+Move apps/emqttd/src src
+
 Session
 
 Queue
@@ -14,10 +20,10 @@ Alarm
 Protocol Compliant
 
 
-0.8.6-beta (2015-06-15)
+0.8.6-beta (2015-06-17)
 -------------------------
 
-Bugfix: issue #175 - should publish Will message when websocket is closed without 'DISCONNECT' packet
+Bugfix: issue #175 - publish Will message when websocket is closed without 'DISCONNECT' packet
 
 
 0.8.5-beta (2015-06-10)
diff --git a/TODO b/TODO
index e43cbfda2..017073616 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,12 @@
 
+
+v0.9.0-alpha (2015-05-30)
+-------------------------
+
+Redis
+
+MySQL
+
 v0.9.0-alpha (2015-05-30)
 -------------------------
 
diff --git a/apps/emqttd/src/emqttd_protocol.erl b/apps/emqttd/src/emqttd_protocol.erl
index 7bdc1d67c..dbd6bfa72 100644
--- a/apps/emqttd/src/emqttd_protocol.erl
+++ b/apps/emqttd/src/emqttd_protocol.erl
@@ -289,16 +289,8 @@ shutdown(duplicate_id, _State) ->
 shutdown(_, #proto_state{clientid = undefined}) ->
     ignore;
 
-%%TODO:
-shutdown(normal, #proto_state{peername = Peername, clientid = ClientId, will_msg = WillMsg}) ->
-	lager:info([{client, ClientId}], "Client ~s@~s: normal shutdown",
-            [ClientId, emqttd_net:format(Peername)]),
-    try_unregister(ClientId),
-    send_willmsg(ClientId, WillMsg),
-    emqttd_broker:foreach_hooks(client_disconnected, [normal, ClientId]);
-
 shutdown(Error, #proto_state{peername = Peername, clientid = ClientId, will_msg = WillMsg}) ->
-	lager:info([{client, ClientId}], "Protocol ~s@~s: Shutdown for ~p",
+	lager:info([{client, ClientId}], "Client ~s@~s: shutdown ~p",
                    [ClientId, emqttd_net:format(Peername), Error]),
     send_willmsg(ClientId, WillMsg),
     try_unregister(ClientId),
diff --git a/go b/go
index ac0709fd1..7e7d9d1dd 100755
--- a/go
+++ b/go
@@ -2,4 +2,4 @@
 # -*- tab-width:4;indent-tabs-mode:nil -*-
 # ex: ts=4 sw=4 et
 
-make && make dist && cd rel/emqttd && ./bin/emqttd console
+make && make rel && cd rel/emqttd && ./bin/emqttd console