diff --git a/Makefile b/Makefile
index 7fc513ffc..d1dc06a8c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,4 +27,7 @@ edoc:
 	@$(REBAR) doc
 
 dist:
+	#TODO write new Makefile
 	cd rel && ../rebar generate -f
+	cp -R plugins/emqttd_plugin_demo rel/emqttd/plugins/ && rm -rf rel/emqttd/plugins/emqttd_plugin_demo/src
+
diff --git a/TODO b/TODO
index 687fce68f..773a48954 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,3 @@
-0.5.5
--------------------------
-
-static, dynmaic, bridge types of topic and trie node
-
-try_to_remove topic node
-
-
 v0.6.0-alpha (2015-03-20)
 -------------------------
 
@@ -57,15 +49,6 @@ full test cases...
 spawn_link to replace 'spawn' and 'link'
 
 =======
-## ACL
-
-## Authentication with clientId
-
-## SSL/TLS Socket
-
-## $SYS/topics and Broker statistics...
-
-## Cluster 
 
 ## Bridge
 
@@ -75,4 +58,3 @@ spawn_link to replace 'spawn' and 'link'
 
 ## Mnesia 
 
-Create Schema...