diff --git a/CHANGES.txt b/CHANGES.rst
similarity index 69%
rename from CHANGES.txt
rename to CHANGES.rst
index 32f04c9d..c5c7bdf4 100644
--- a/CHANGES.txt
+++ b/CHANGES.rst
@@ -1,3 +1,15 @@
+0.4 (2013/12/25)
+    - Use `chdkptp` utility for controlling cameras with CHDK firmware
+    - Fix instability when shooting with CHDK cameras
+    - Shoot images in RAW/DNG file format *(experimental)*
+    - Remove `download` step, images will be directly streamed to the project
+      directory
+    - Remove `combine` plugin, images will be combined in `capture` step
+    - Device driver and plugins, as well as their order of execution can be set
+      interactively via the `configure` subcommand, which has to be run before
+      the first usage.
+    - Lots of internal API changes
+
 0.3.3 (2013/08/28)
     - Fix typo in device manager that prevent drivers from being loaded
 
diff --git a/doc/changelog.rst b/doc/changelog.rst
index 54fcdacb..d25cc771 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -1,13 +1,16 @@
 Changelog
 =========
-0.4 (2013/12/24)
+0.4 (2013/12/25)
 ----------------
-* Windows support
 * Use `chdkptp` utility for controlling cameras with CHDK firmware
+* Fix instability when shooting with CHDK cameras
+* Shoot images in RAW/DNG file format *(experimental)*
 * Remove `download` step, images will be directly streamed to the project
   directory
-* Device driver and plugins can be selecte interactively via the `configure`
-  subcommand
+* Remove `combine` plugin, images will be combined in `capture` step
+* Device driver and plugins, as well as their order of execution can be set
+  interactively via the `configure` subcommand, which has to be run before
+  the first usage.
 * Lots of internal API changes
 
 0.3.3 (2013/08/28)
diff --git a/setup.py b/setup.py
index 7712b19c..01500b8a 100644
--- a/setup.py
+++ b/setup.py
@@ -3,11 +3,13 @@
 from setuptools.command.test import test as TestCommand
 import sys
 
+
 class PyTest(TestCommand):
     def finalize_options(self):
         TestCommand.finalize_options(self)
         self.test_args = []
         self.test_suite = True
+
     def run_tests(self):
         #import here, cause outside the eggs aren't loaded
         import pytest
@@ -16,7 +18,7 @@ def run_tests(self):
 
 setup(
     name='spreads',
-    version='0.3.3',
+    version='0.4',
     author='Johannes Baiter',
     author_email='johannes.baiter@gmail.com',
     packages=['spreads', 'spreadsplug', 'spreadsplug.dev'],
@@ -26,6 +28,16 @@ def run_tests(self):
     license='MIT',
     description='Book digitization workflow assistant',
     long_description=open('README.rst').read(),
+    platforms = "Posix",
+    classifiers = [
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "Environment :: X11 Applications :: Qt",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: POSIX",
+        "Topic :: Multimedia :: Graphics :: Capture",
+        "Programming Language :: Python :: 2.7"
+    ],
     install_requires=[
         "colorama >= 0.2.5",
         "pyusb >= 1.0.0a3",
@@ -50,5 +62,5 @@ def run_tests(self):
         ],
     },
     tests_require=['pytest'],
-    cmdclass = {'test': PyTest},
+    cmdclass={'test': PyTest},
 )