diff --git a/scripts/tag-version.sh b/scripts/tag-version.sh
new file mode 100755
index 000000000..b1af9e260
--- /dev/null
+++ b/scripts/tag-version.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Check current dir
+[[ ! -d ".git" ]] && echo "this script must be executed from git repo root" && exit 1
+
+# Check target tag
+[[ -z "$1" ]] && echo "usage: $0 <new-version>" && exit 1
+
+# Validate new version
+new_tag="$1"
+for cur_tag in `git tag`; do
+	[[ "$cur_tag" == "$new_tag" ]] && echo "$new_tag already tagged" && exit 1
+done
+
+# Update ChangeLog
+echo "Updating ChangeLog for $new_tag"
+git log > docs/ChangeLog
+git commit -m "Update ChangeLog for version $new_tag" docs/ChangeLog
+
+# tag version
+echo "Tagging version: $new_tag"
+git tag $new_tag HEAD
+
+# Push changes upstream
+git push && git push --tags