diff --git a/configuration b/configuration
deleted file mode 100644
index f5be485d..00000000
--- a/configuration
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "Radicale",
-  "description": "CalDAV Server",
-  "menu": [
-    {"name": "News", "link": "/news/"},
-    {"name": "Documentation", "link": "/documentation/"},
-    {"name": "Contribute", "link": "/contribute/"},
-    {"name": "Download", "link": "/download/"}
-  ]
-}
diff --git a/configuration.yaml b/configuration.yaml
new file mode 100644
index 00000000..5c80b545
--- /dev/null
+++ b/configuration.yaml
@@ -0,0 +1,46 @@
+name: Radicale
+description: CalDAV Server
+license: GPLv3
+public: true
+url: http://www.radicale.org/
+
+menu:
+  - News:
+      link: /news/
+  - Documentation:
+      link: /documentation/
+  - Contribute:
+      link: /contribute/
+  - Download:
+      link: /download/
+
+vcs:
+  git:
+    url: git://gitorious.org/radicale/radicale.git
+    path: /home/lize/Informatique/radicale
+
+code browser:
+  gitorious:
+    project name: radicale
+    repository name: radicale
+  redmine:
+    base url: http://redmine.kozea.fr/
+    project name: radicale
+
+bug tracker:
+  redmine:
+    base url: http://redmine.kozea.fr/
+    project name: radicale
+    database: /var/
+
+mailing list:
+  mbox:
+    folder: /var/local/
+
+room:
+  jabber:
+    address: radicale@room.jabber.kozea.fr
+
+package repository:
+  pypi:
+    project name: radicale
diff --git a/pages/user_documentation.rst b/pages/user_documentation.rst
index a8c04494..7cdfaea1 100644
--- a/pages/user_documentation.rst
+++ b/pages/user_documentation.rst
@@ -340,6 +340,56 @@ options. These options are available by typing::
   radicale --help
 
 
+WSGI, CGI and FastCGI
+---------------------
+
+Radicale comes with a `WSGI <http://wsgi.org/>`_ support, allowing the software
+to be used behind any HTTP server supporting WSGI such as Apache.
+
+Moreover, it is possible to use `flup
+<http://trac.saddi.com/flup/wiki/FlupServers>`_ to wrap Radicale into a CGI,
+FastCGI, SCGI or AJP application, and therefore use it with Lighttpd, Nginx or
+even Tomcat.
+
+Apache and mod_wsgi
+~~~~~~~~~~~~~~~~~~~
+
+To use Radicale with Apache's ``mod_wsgi``, you first have to write your
+``.wsgi`` file (in ``/var/www`` for example):
+
+.. code-block:: python
+
+   import radicale
+   application = radicale.Application()
+
+.. note::
+   We assume that the Radicale module is installed in your Python path.
+
+Next you have to create the Apache virtual host (adapt the configuration
+to your environment):
+
+.. code-block:: apache
+
+   <VirtualHost *:80>
+       ServerName cal.yourdomain.org
+
+       WSGIDaemonProcess radicale user=www-data group=www-data threads=1
+       WSGIScriptAlias / /var/www/radicale.wsgi
+
+       <Directory /var/www>
+           WSGIProcessGroup radicale
+           WSGIApplicationGroup %{GLOBAL}
+           AllowOverride None
+           Order allow,deny
+           allow from all
+       </Directory>
+   </VirtualHost>
+
+.. note::
+   You should use the root of the (sub)domain (``WSGIScriptAlias /``), else
+   some CalDAV features will not work.
+
+
 Authentication and URLs
 -----------------------