diff --git a/doc/Makefile.am b/doc/Makefile.am
index 147437547..3e2b033e6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,8 +1,9 @@
-## Copyright (C) 2010, 2011 Laboratoire de Recherche et Développement de
-## l'Epita (LRDE).
+## -*- coding: utf-8 -*-
+## Copyright (C) 2010, 2011, 2013 Laboratoire de Recherche et
+## Développement de l'Epita (LRDE).
 ## Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris
-## 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
-## Université Pierre et Marie Curie.
+## 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
+## Université Pierre et Marie Curie.
 ##
 ## This file is part of Spot, a model checking library.
 ##
@@ -52,4 +53,5 @@ EXTRA_DIST = \
   footer.html \
   mainpage.dox \
   $(srcdir)/stamp \
-  $(srcdir)/spot.html
+  $(srcdir)/spot.html \
+  org/.dir-locals.el
diff --git a/doc/org/.dir-locals.el b/doc/org/.dir-locals.el
new file mode 100644
index 000000000..a30bf9806
--- /dev/null
+++ b/doc/org/.dir-locals.el
@@ -0,0 +1,21 @@
+((nil . ((whitespace-action auto-cleanup)
+	 (whitespace-style face empty trailing lines-tail)
+	 (require-final-newline . t)
+	 (mode . whitespace)))
+ (org-mode . ((whitespace-style face empty trailing)
+	      (org-publish-project-alist
+	       . (("spot-html"
+		   :base-directory "."
+		   :base-extension "org"
+		   :publishing-directory "../userdoc/"
+		   :recursive t
+		   :publishing-function org-publish-org-to-html
+		   :style "<link rel=\"stylesheet\" type=\"text/css\" href=\"http://spot.lip6.fr/css/spot-zenburn.css\" />"
+		   :auto-preamble t)
+		  ("spot-static"
+		   :base-directory "."
+		   :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf"
+		   :publishing-directory "../userdoc/"
+		   :recursive t
+		   :publishing-function org-publish-attachment)
+		  ("spot-all" :components ("spot-html" "spot-static")))))))