diff --git a/MANIFEST.in b/MANIFEST.in
index 387a54cbfa01628700dabde2be43bab6ef316b3a..b30c302e4c04e9057d7f81df195469d70c94a49a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
-include src/cl/*.h
-include src/cl/*.cl
+include pyopencl/cl/*.h
+include pyopencl/cl/*.cl
 
 include src/wrapper/*.hpp
 include src/wrapper/*.cpp
diff --git a/setup.py b/setup.py
index 00438f1e6c9888a0755fe37ac30c0de2e50df0b8..aed7503cbab2755387a1d70b349f1bdf2e8e1463 100644
--- a/setup.py
+++ b/setup.py
@@ -178,7 +178,14 @@ def main():
               'Natural Language :: English',
               'Programming Language :: C++',
               'Programming Language :: Python',
+              'Programming Language :: Python :: 2',
+              'Programming Language :: Python :: 2.4',
+              'Programming Language :: Python :: 2.5',
+              'Programming Language :: Python :: 2.6',
+              'Programming Language :: Python :: 2.7',
               'Programming Language :: Python :: 3',
+              'Programming Language :: Python :: 3.2',
+              'Programming Language :: Python :: 3.3',
               'Topic :: Scientific/Engineering',
               'Topic :: Scientific/Engineering :: Mathematics',
               'Topic :: Scientific/Engineering :: Physics',
@@ -228,7 +235,8 @@ def main():
                     },
 
             # 2to3 invocation
-            cmdclass={'build_py': build_py})
+            cmdclass={'build_py': build_py},
+            zip_safe=False)