diff --git a/.travis.yml b/.travis.yml
index 6f3d859d..169e153b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,9 @@ git:
   depth: 1
 notifications:
   email: false
+before_deploy:
+  - export TRAVIS_TAG=${TRAVIS_TAG:-$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)}
+  - git tag $TRAVIS_TAG
 deploy:
   provider: releases
   api_key:
@@ -39,4 +42,4 @@ deploy:
   name: "OpenDiablo Unstable (Build $TRAVIS_BUILD_NUMBER)"
   prerelease: true
   on:
-    tags: true
+    branch: master