diff --git a/.travis.yml b/.travis.yml
index 05198cf..3704d07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,3 +23,4 @@ script:
 
 after_script:
    - docker-compose down
+   - sh .travis/deploy_dockerhub.sh
diff --git a/.travis/deploy_dockerhub.sh b/.travis/deploy_dockerhub.sh
new file mode 100644
index 0000000..201e963
--- /dev/null
+++ b/.travis/deploy_dockerhub.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+docker push maxking/mailman-web
+docker push maxking/mailman-core
diff --git a/build.sh b/build.sh
index e0471c6..5903f51 100755
--- a/build.sh
+++ b/build.sh
@@ -4,8 +4,13 @@ set -e
 
 # Use this script to build docker images.
 
+if [ "$TRAVIS_BRANCH" = "master" ]; then
+    TAG="latest"
+else
+    TAG="$TRAVIS_BRANCH"
+fi
+
 DOCKER=docker
 
-
-$DOCKER build -t maxking/mailman-core core/
-$DOCKER build -t maxking/mailman-web web/
+$DOCKER build -t maxking/mailman-core:$TAG core/
+$DOCKER build -t maxking/mailman-web:$TAG web/