diff --git a/Makefile b/Makefile
index c409d269214d..f9ceb13cddb8 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,12 @@ export NODE_ENV = test
 clean:
 	rm -rf coverage templates.json test/tmp dist
 
-test:
-	$(MOCHA_CMD)
-
 bench:
 	node node_modules/matcha/bin/_matcha
 
+test:
+	$(MOCHA_CMD)
+
 test-cov:
 	rm -rf coverage
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) --
@@ -39,6 +39,8 @@ build:
 
 publish:
 	rm -rf node_modules
+
+	git pull --rebase
 	npm install
 
 	node bin/cache-templates
@@ -47,6 +49,7 @@ publish:
 	test -f templates.json
 	npm publish
 
-	# todo - auto-create tag
+	git tag "v`6to5 -V`"
+	git push --tags
 
 	rm -rf templates.json