diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index 5a92382..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,14 +0,0 @@
-# file GENERATED by distutils, do NOT edit
-setup.py
-facemovie\Eye.py
-facemovie\Face.py
-facemovie\FaceParams.py
-facemovie\Facemovie.py
-facemovie\Facemoviefier.py
-facemovie\Guy.py
-facemovie\__init__.py
-facemovie\training_types.py
-facemovie\haarcascades\__init__.py
-facemovie\lib\__init__.py
-facemovie\lib\exif.py
-test\test_script.py
diff --git a/setup.py b/setup.py
index 9a1aa88..23167bb 100644
--- a/setup.py
+++ b/setup.py
@@ -20,18 +20,24 @@ setup(
     author = "Julien Lengrand-Lambert",
     author_email = "jlengrand@gmail.com",
     description = ("An application aiming at creating a video of faces for people taking 'one picture a day' of themselves"),
-    license = "BSD",
+    license = "BSD License",
     keywords = "image_processing computer_vision one_picture_a_day photography",
     url = "https://github.com/jlengrand/FaceMovie",
+    download_url = "https://github.com/jlengrand/FaceMovie", # FIXME : To be updated
     packages=['facemovie', 'facemovie.lib', 'facemovie.haarcascades'],
     package_data={'facemovie': ['haarcascades/*.xml']}, # Adds xml files to the lib
     long_description=read('README.markdown'),
     classifiers=[
         "Development Status :: 3 - Alpha",
-        "Topic :: Utilities",
+        "Topic :: Multimedia :: Graphics",
+        "Intended Audience :: End Users/Desktop",
         "Environment :: Console",
         "License :: OSI Approved :: BSD License",
+        "Natural Language :: English",
+        "Operating System :: Microsoft",
+        "Programming Language :: Python :: 2 :: Only",
     ],
+    platforms ={"Linux"},
     options = {'py2exe': {'bundle_files': 1, 'includes': ['numpy'] } },
     console=['facemovie/Facemoviefier.py'],
     zipfile = None,