diff --git a/.travis.yml b/.travis.yml
index 6a6a5ef..be7b2a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,11 @@
 language: python
 python:
-    - "2.6"
-    - "2.7"
-    - "3.2"
-    - "3.3"
+    - '2.6'
+    - '2.7'
+    - '3.2'
+    - '3.3'
+    - '3.4'
+    - '3.5'
 install:
     - python setup.py install
     - pip install coverage
@@ -12,3 +14,16 @@ script:
     - coverage run --source=random_words setup.py test
 after_success:
     - coveralls
+sudo: false
+matrix:
+  allow_failures:
+    - python: 3.2
+deploy:
+  provider: pypi
+  user: swiety
+  password:
+    secure: O1/w8g7QwrUPeMy0l5mnFjs2fgUU5XNyVKTWZywZ2t0X8rDACpkJGpj10jK86zi0EcI0cB/NnOSbyQ1ZvVS9clxIjb082kiunvVRFP4iznjeBg3HZ2mA0etU+bobYj4PvGbmJ4bE5fi5/W6hT0zzW++iHDNbZdstjAjHhjmJHa4=
+  on:
+    tags: true
+    repo: tomislater/RandomWords
+    branch: master
diff --git a/setup.py b/setup.py
index fe5300d..6119247 100644
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,8 @@ def run_tests(self):
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     include_package_data=True,