diff --git a/.travis.yml b/.travis.yml
index 7d6271ba4..37a114212 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,42 +1,50 @@
 dist: trusty
 language: python
+cache: pip
+notifications:
+  email: false
+
 python:
 - 3.5.3
 - 3.6.1
 install:
 - echo "pytest>3" >> requirements.txt
 - echo "pytest-asyncio" >> requirements.txt
-- echo "git+https://github.com/Rapptz/discord.py.git@rewrite#egg=discord.py[voice]"
-  >> requirements.txt
+- echo "git+https://github.com/Rapptz/discord.py.git@rewrite#egg=discord.py[voice]" >> requirements.txt
 - pip install -r requirements.txt
 - pip install .
 script:
 - python -m compileall ./redbot/cogs
 - python -m pytest
-before_deploy:
-- curl https://artifacts.crowdin.com/repo/GPG-KEY-crowdin | sudo apt-key add -
-- echo "deb https://artifacts.crowdin.com/repo/deb/ /" | sudo tee -a /etc/apt/sources.list
-- sudo apt-get update -qq
-- sudo apt-get install -y crowdin
-deploy:
-  - provider: pypi
-    user: Red-DiscordBot
-    password:
-      secure: Ty9vYnd/wCuQkVC/OsS4E2jT9LVDVfzsFrQc4U2hMYcTJnYbl/3omyObdCWCOBC40vUDkVHAQU8ULHzoCA+2KX9Ds/7/P5zCumAA0uJRR9Smw7OlRzSMxJI+/lGq4CwXKzxDZKuo5rsxXEbW5qmYjtO8Mk6KuLkvieb1vyr2DcqWEFzg/7TZNDfD1oP8et8ITQ26lLP1dtQx/jlAiIBzgK9wziuwj1Divb9A///VsGz43N8maZ+jfsDjYqrfUVWTy3ar7JPUplletenYCR1PmQ5C46XfV0kitKd1aITJ48YPAKyYgKy8AIT+Uz1JArTnqdzLSFRNELS57qS00lzgllbteCyWQ8Uzy0Zpxb/5DDH8/mL1n0MyJrF8qjZd2hLNAXg3z/k9bGXeiMLGwoxRlGXkL2XpiVgI93UKKyVyooGNMgPTc/QdSc7krjAWcOtX/HgLR34jxeLPFEdzJNAFIimfDD8N+XTFcNBw6EvOYm/n5MXkckNoX/G+ThNobHZ7VKSASltZ9zBRAJ2dDh35G3CYmVEk33U77RKbL9le/Za9QVBcAO8i6rqVGYkdO7thHHKHc/1CB1jNnjsFSDt0bURtNfAqfwKCurQC8487zbEzT+2fog3Wygv7g3cklaRg4guY8UjZuFWStYGqbroTsOCd9ATNqeO5B13pNhllSzU=
-    skip_cleanup: true
-    on:
-      repo: Cog-Creators/Red-DiscordBot
-      branch: V3/develop
+
+jobs:
+  include:
+    - stage: Deployment
+      if: tag IS present
       python: 3.5.3
-      tags: true
-  - provider: script
-    script: python3 ./generate_strings.py
-    skip_cleanup: true
-    on:
-      repo: Cog-Creators/Red-DiscordBot
-      branch: V3/develop
-      python: 3.5.3
-      tags: true
-cache: pip
-notifications:
-  email: false
+      env:
+        - DEPLOYING=true
+      before_deployment:
+      - curl https://artifacts.crowdin.com/repo/GPG-KEY-crowdin | sudo apt-key add -
+      - echo "deb https://artifacts.crowdin.com/repo/deb/ /" | sudo tee -a /etc/apt/sources.list
+      - sudo apt-get update -qq
+      - sudo apt-get install -y crowdin
+      deploy:
+        - provider: pypi
+          user: Red-DiscordBot
+          password:
+            secure: Ty9vYnd/wCuQkVC/OsS4E2jT9LVDVfzsFrQc4U2hMYcTJnYbl/3omyObdCWCOBC40vUDkVHAQU8ULHzoCA+2KX9Ds/7/P5zCumAA0uJRR9Smw7OlRzSMxJI+/lGq4CwXKzxDZKuo5rsxXEbW5qmYjtO8Mk6KuLkvieb1vyr2DcqWEFzg/7TZNDfD1oP8et8ITQ26lLP1dtQx/jlAiIBzgK9wziuwj1Divb9A///VsGz43N8maZ+jfsDjYqrfUVWTy3ar7JPUplletenYCR1PmQ5C46XfV0kitKd1aITJ48YPAKyYgKy8AIT+Uz1JArTnqdzLSFRNELS57qS00lzgllbteCyWQ8Uzy0Zpxb/5DDH8/mL1n0MyJrF8qjZd2hLNAXg3z/k9bGXeiMLGwoxRlGXkL2XpiVgI93UKKyVyooGNMgPTc/QdSc7krjAWcOtX/HgLR34jxeLPFEdzJNAFIimfDD8N+XTFcNBw6EvOYm/n5MXkckNoX/G+ThNobHZ7VKSASltZ9zBRAJ2dDh35G3CYmVEk33U77RKbL9le/Za9QVBcAO8i6rqVGYkdO7thHHKHc/1CB1jNnjsFSDt0bURtNfAqfwKCurQC8487zbEzT+2fog3Wygv7g3cklaRg4guY8UjZuFWStYGqbroTsOCd9ATNqeO5B13pNhllSzU=
+          skip_cleanup: true
+          on:
+            repo: Cog-Creators/Red-DiscordBot
+            branch: V3/develop
+            python: 3.5.3
+            tags: true
+        - provider: script
+          script: python3 ./generate_strings.py
+          skip_cleanup: true
+          on:
+            repo: Cog-Creators/Red-DiscordBot
+            branch: V3/develop
+            python: 3.5.3
+            tags: true
diff --git a/setup.py b/setup.py
index b357ca85b..221046070 100644
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,7 @@ import sys
 from setuptools import find_packages
 
 IS_TRAVIS = 'TRAVIS' in os.environ
+IS_DEPLOYING = 'DEPLOYING' in os.environ
 
 dep_links = ['https://github.com/Rapptz/discord.py/tarball/rewrite#egg=discord.py-1.0']
 if IS_TRAVIS:
@@ -22,7 +23,7 @@ def get_package_list():
 def get_requirements():
     with open('requirements.txt') as f:
         requirements = f.read().splitlines()
-    if IS_TRAVIS:
+    if IS_TRAVIS and not IS_DEPLOYING:
         requirements.remove('git+https://github.com/Rapptz/discord.py.git@rewrite#egg=discord.py[voice]')
     else:
         requirements.append('discord.py>=1.0.0a0')  # Because RTD