diff --git a/buildout.cfg b/buildout.cfg
new file mode 100644
index 0000000..bb8292d
--- /dev/null
+++ b/buildout.cfg
@@ -0,0 +1,26 @@
+[buildout]
+develop = .
+parts +=
+    test
+    py
+    coverage
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = 
+    icalendar[test]
+defaults = ['--auto-color', '--auto-progress']
+
+[py]
+recipe = zc.recipe.egg
+interpreter = py
+eggs = ${test:eggs}
+scripts =
+
+[coverage]
+recipe = collective.recipe.template
+input = inline:
+    #!/bin/sh
+    ./bin/test --coverage ../../coverage -v --auto-progress "$@"
+output = ${buildout:directory}/bin/coverage
+mode = 755
diff --git a/setup.py b/setup.py
index 67ad22e..f3122d7 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 import os
 import setuptools
 
-version = '3.1dev'
+version = '3.1'
 shortdesc = 'iCalendar parser/generator'
 longdesc = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
 longdesc += open(os.path.join(os.path.dirname(__file__),