diff --git a/setup.py b/setup.py
index 3b98a2a..c38e578 100644
--- a/setup.py
+++ b/setup.py
@@ -38,17 +38,19 @@
     description='Kafka Logging Handler',
     long_description=readme(),
     classifiers=[
+        'Development Status :: 4 - Beta',
         'Topic :: System :: Logging',
         'Topic :: Internet :: Log Analysis',
         'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
     ],
-    keywords='kafka logging',
+    keywords=['kafka', 'logging', 'log handler', 'message bus'],
     url='https://gerrit.opencord.org/gitweb?p=kafkaloghandler.git',
     author='Zack Williams',
     author_email='zdw@opennetworking.org',
     packages=['kafkaloghandler'],
     license='Apache v2',
     install_requires=parse_requirements('requirements.txt'),
-    include_package_data=True,
-    zip_safe=False,
+    data_files=[('', ['VERSION', 'requirements.txt', 'README.rst'])],
 )