diff --git a/MANIFEST.in b/MANIFEST.in
index 97a85bd5..1e03cb74 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,4 @@
 recursive-include powerline *.json *.vim
 recursive-include powerline/bindings *.*
+recursive-exclude powerline/bindings *.pyc *.pyo
+recursive-include client *.*
diff --git a/setup.py b/setup.py
index c34d8424..3c670819 100755
--- a/setup.py
+++ b/setup.py
@@ -53,14 +53,32 @@ else:
 	can_use_scripts = False
 
 setup(
-	name='Powerline',
+	name='powerline-status',
 	version='beta',
 	description='The ultimate statusline/prompt utility.',
 	long_description=README,
-	classifiers=[],
+	classifiers=[
+		'Development Status :: 4 - Beta',
+		'Environment :: Console',
+		'Environment :: Plugins',
+		'Intended Audience :: End Users/Desktop',
+		'License :: OSI Approved :: MIT License',
+		'Natural Language :: English',
+		'Operating System :: Microsoft :: Windows',
+		'Operating System :: POSIX',
+		'Programming Language :: Python :: 2.6',
+		'Programming Language :: Python :: 2.7',
+		'Programming Language :: Python :: 3.2',
+		'Programming Language :: Python :: 3.3',
+		'Programming Language :: Python :: 3.4',
+		'Programming Language :: Python :: Implementation :: CPython',
+		'Programming Language :: Python :: Implementation :: PyPy',
+	],
+	download_url='https://github.com/Lokaltog/powerline/archive/develop.zip',
 	author='Kim Silkebaekken',
 	author_email='kim.silkebaekken+vim@gmail.com',
 	url='https://github.com/Lokaltog/powerline',
+	license='MIT',
 	# XXX Python 3 doesn't allow compiled C files to be included in the scripts 
 	# list below. This is because Python 3 distutils tries to decode the file to 
 	# ASCII, and fails when powerline-client is a binary.