diff --git a/script/lint b/script/lint
index 05178a20ad8..c8b65f99677 100755
--- a/script/lint
+++ b/script/lint
@@ -5,14 +5,15 @@ cd "$(dirname "$0")/.."
 echo "Checking style with flake8..."
 flake8 --exclude www_static homeassistant
 
-STATUS=$?
+FLAKE8_STATUS=$?
 
 echo "Checking style with pylint..."
 pylint homeassistant
+PYLINT_STATUS=$?
 
-if [ $STATUS -eq 0 ]
+if [ $FLAKE8_STATUS -eq 0 ]
 then
-  exit $?
+  exit $FLAKE8_STATUS
 else
-  exit $STATUS
+  exit $PYLINT_STATUS
 fi
diff --git a/script/release b/script/release
new file mode 100755
index 00000000000..40d906b17bf
--- /dev/null
+++ b/script/release
@@ -0,0 +1,21 @@
+# Pushes a new version to PyPi
+
+cd "$(dirname "$0")/.."
+
+head -n 3 homeassistant/const.py | tail -n 1 | grep dev
+
+if [ $? -eq 0 ]
+then
+  echo "Release version should not contain dev tag"
+  exit 1
+fi
+
+CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+
+if [ "$CURRENT_BRANCH" != "master" ]
+then
+  echo "You have to be on the master branch to release."
+  exit 1
+fi
+
+python3 setup.py sdist bdist_wheel upload
diff --git a/script/test b/script/test
index 2e13bcc4b0e..d407f57a338 100755
--- a/script/test
+++ b/script/test
@@ -7,19 +7,21 @@ cd "$(dirname "$0")/.."
 
 script/lint
 
-STATUS=$?
+LINT_STATUS=$?
 
 echo "Running tests..."
 
 if [ "$1" = "coverage" ]; then
   py.test --cov --cov-report=
+  TEST_STATUS=$?
 else
   py.test
+  TEST_STATUS=$?
 fi
 
-if [ $STATUS -eq 0 ]
+if [ $LINT_STATUS -eq 0 ]
 then
-  exit $?
+  exit $TEST_STATUS
 else
-  exit $STATUS
+  exit $LINT_STATUS
 fi