diff --git a/.travis.yml b/.travis.yml
index 91908e24..7e7d3999 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,24 @@ script: python setup.py test
 after_success:
   - coverage run --source=openxc setup.py test
   - coveralls
+before_deploy:
+  - cd ..
+  - mkdir upload
+  - tar -zcf upload/SourceCode.tar.gz openxc-python
+  - zip -r upload/SourceCode.zip openxc-python
 deploy:
-  provider: pypi
-  server: https://pypi.org/legacy/
-  user: "__token__"
-  password: $PYPI_PASSWORD
-  on:
-    branch: master
+  - provider: release
+    api_key:
+      secure: $GITHUBAPI
+    file_glob: true
+    file: upload/*
+    skip_cleanup: true
+    on:
+      tags: true
+  - provider: pypi
+    server: https://pypi.org/legacy/
+    user: "__token__"
+    password: $PYPI_PASSWORD
+    on:
+      all_branches: true
+