diff --git a/setup.py b/setup.py
index b0f84b0..9fbad9b 100644
--- a/setup.py
+++ b/setup.py
@@ -4,15 +4,33 @@ with open('README.txt') as file:
     long_description = file.read()
 
 setup(
-    name = 'robohash',
-    packages = ['robohash'], 
-    version = '1.0',
-    description = 'One of the leading robot-based hashing tools on the web',
+    name='robohash',
+    packages=['robohash'],
+    version='1.0',
+    description='One of the leading robot-based hashing tools on the web',
     long_description=long_description,
-    author = 'Colin Davis',
-    author_email = 'cdavis@tavern.is',
-    url = 'https://github.com/e1ven/Robohash',
-    download_url = 'https://github.com/e1ven/Robohash/tarball/1.0',
-    keywords = ['robots'], # arbitrary keywords
-    classifiers = [],
-)
\ No newline at end of file
+    author='Colin Davis',
+    author_email='cdavis@tavern.is',
+    url='https://github.com/e1ven/Robohash',
+    download_url='https://github.com/e1ven/Robohash/tarball/1.0',
+    keywords=['robots'], # arbitrary keywords
+    license='MIT',
+    classifiers=[
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 3",
+        "Topic :: Security",
+    ],
+    package_data={
+        'robohash': [
+            'sets/set1/*/*/*',
+            'sets/set2/*/*',
+            'sets/set3/*/*',
+            'backgrounds/*/*',
+        ]
+    },
+    install_requires=['pillow', 'natsort'],
+    extras_require={
+        'web': ['tornado'],
+    },
+)