diff --git a/Makefile b/Makefile
index 6f1ec3ab7..3babaec69 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,16 @@
-.PHONY: test
+.PHONY: rel deps test plugins
 
-REBAR=./rebar
+APP		 = emqttd
+BASE_DIR = $(shell pwd)
+REBAR    = $(BASE_DIR)/rebar
+DIST	 = $(BASE_DIR)/rel/$(APP)
 
-all: get-deps compile
+all: deps compile
 
-compile: get-deps
+compile: deps
 	@$(REBAR) compile
 
-get-deps:
+deps:
 	@$(REBAR) get-deps
 
 update-deps:
@@ -25,8 +28,13 @@ test:
 edoc:
 	@$(REBAR) doc
 
-dist: compile
-	#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
+rel: compile
+	@cd rel && ../rebar generate -f
+
+plugins:
+	@for plugin in ./plugins/* ; do \
+		cp -R $${plugin} $(DIST)/plugins/ && rm -rf $(DIST)/$${plugin}/src/ ; \
+	done
+
+dist: rel plugins