diff --git a/.gitignore b/.gitignore
index eee77d4..f2ec26c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+# Python
 *.py[cod]
 
 # C extensions
@@ -9,25 +10,30 @@
 dist
 build
 eggs
+.eggs
 parts
 bin
-include
-man
 var
 sdist
 develop-eggs
 .installed.cfg
 lib
 lib64
-.Python
+pip-wheel-metadata
 
-# Installer logs
+# Logs
+*.log
 pip-log.txt
 
 # Unit test / coverage reports
 .coverage
 .tox
+coverage.xml
 nosetests.xml
+htmlcov/
+test-reports/
+test-results.xml
+test-output.xml
 
 # Translations
 *.mo
diff --git a/.travis.yml b/.travis.yml
index 779deeb..6d77029 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,11 @@ cache:
 before_install:
   - pip install -r requirements_all.txt
   - pip install -e .
-script:
+install:
+  - python setup.py install
+  - python setup.py sdist
+before_script:
   - pylint pyicloud tests
-  - ./scripts/check_format.sh;
+  - ./scripts/check_format.sh
+script:
   - py.test
diff --git a/setup.py b/setup.py
index 597f8c4..f175ce7 100644
--- a/setup.py
+++ b/setup.py
@@ -1,23 +1,28 @@
 from setuptools import setup, find_packages
+from codecs import open
 
+REPO_URL = "https://github.com/picklepete/pyicloud"
+VERSION = "0.9.6.1"
 
 with open("requirements.txt") as f:
     required = f.read().splitlines()
 
+with open("README.rst", encoding="utf-8") as f:
+    long_description = f.read()
 
 setup(
     name="pyicloud",
-    version="0.9.6.1",
-    url="https://github.com/picklepete/pyicloud",
-    description=(
-        "PyiCloud is a module which allows pythonistas to "
-        "interact with iCloud webservices."
-    ),
+    version=VERSION,
+    url=REPO_URL,
+    download_url=REPO_URL + "/tarball/" + VERSION,
+    description="PyiCloud is a module which allows pythonistas to interact with iCloud webservices.",
+    long_description=long_description,
     maintainer="The PyiCloud Authors",
     maintainer_email=" ",
-    license="MIT",
     packages=find_packages(include=["pyicloud*"]),
     install_requires=required,
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*",
+    license="MIT",
     classifiers=[
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
@@ -27,8 +32,11 @@ setup(
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
     ],
     entry_points={"console_scripts": ["icloud = pyicloud.cmdline:main"]},
+    keywords=["icloud", "find-my-iphone"],
 )