diff --git a/setup.py b/setup.py
index 4292c716..3f0fedac 100644
--- a/setup.py
+++ b/setup.py
@@ -46,28 +46,24 @@ setup(name='dependency_injector',
       long_description=description,
       author='ETS Labs',
       author_email='rmogilatov@gmail.com',
-      maintainer='ETS Labs',
+      maintainer='Roman Mogilatov',
       maintainer_email='rmogilatov@gmail.com',
       url='https://github.com/ets-labs/dependency_injector',
+      bugtrack_url='https://github.com/ets-labs/dependency_injector/issues',
+      download_url='https://pypi.python.org/pypi/dependency_injector',
       license='BSD New',
       packages=['dependency_injector'],
+      platforms=['any'],
       zip_safe=True,
       install_requires=requirements,
       cmdclass={
           'publish': PublishCommand,
       },
       keywords=[
-          'Dependency injection',
-          'Dependency injection framework',
-          'Dependency injection container',
-          'Dependency injector',
-          'Dependency management',
           'DI',
-          'DI Container',
-          'Inversion of Control',
-          'Inversion of Control container',
+          'Dependency injection',
           'IoC',
-          'IoC container',
+          'Inversion of Control',
       ],
       classifiers=[
           'Development Status :: 5 - Production/Stable',