diff --git a/ChangeLog b/ChangeLog
index 0809369f4..d03bc0aa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-29  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	Rename wrap/python/cgi/ as wrap/python/cgi-bin/.
+
+	* wrap/python/cgi/: Rename as ...
+	* wrap/python/cgi-bin/: ... this.
+	* configure.ac, spot/wrap/python/Makefile.am, README: Adjust.
+
 2010-01-29  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	* src/tgbaalgos/gtec/gtec.hh: Fix copyright.
diff --git a/README b/README
index 6dce86120..f4b30f016 100644
--- a/README
+++ b/README
@@ -126,7 +126,7 @@ bench/            Benchmarks for ...
 wrap/	          Wrappers for other languages.
    python/        Python bindings for Spot and BuDDy
       tests/      Tests for these bindings
-      cgi/        Python-based CGI script (ltl-to-tgba translator)
+      cgi-bin/    Python-based CGI script (ltl-to-tgba translator)
 iface/	          Interfaces to other libraries.
    gspn/          GreatSPN interface.
       examples/   Supporting models used by the test cases.
diff --git a/configure.ac b/configure.ac
index 57ff356a8..5c789af93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-# Copyright (C) 2008, 2009 Laboratoire de Recherche et Développement
-# de l'Epita (LRDE).
+# Copyright (C) 2008, 2009, 2010 Laboratoire de Recherche et
+# Développement de l'Epita (LRDE).
 # Copyright (C) 2003, 2004, 2005, 2006, 2007 Laboratoire d'Informatique de
 # Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
 # Pierre et Marie Curie.
@@ -122,7 +122,7 @@ AC_CONFIG_FILES([
   src/tgbatest/Makefile
   wrap/Makefile
   wrap/python/Makefile
-  wrap/python/cgi/Makefile
+  wrap/python/cgi-bin/Makefile
   wrap/python/tests/Makefile
 ])
 AC_CONFIG_FILES([bench/ltl2tgba/ltl2baw.pl:bench/ltl2tgba/ltl2baw.in],
diff --git a/wrap/python/Makefile.am b/wrap/python/Makefile.am
index 785c4d91f..84ec36a1d 100644
--- a/wrap/python/Makefile.am
+++ b/wrap/python/Makefile.am
@@ -1,3 +1,5 @@
+## Copyright (C) 2010 Laboratoire de Recherche et Development de
+## l'Epita (LRDE).
 ## Copyright (C) 2003, 2004  Laboratoire d'Informatique de Paris 6 (LIP6),
 ## département Systèmes Répartis Coopératifs (SRC), Université Pierre
 ## et Marie Curie.
@@ -19,7 +21,7 @@
 ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-SUBDIRS = . cgi tests
+SUBDIRS = . cgi-bin tests
 
 AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/src $(BUDDY_CPPFLAGS)
 
diff --git a/wrap/python/cgi/.cvsignore b/wrap/python/cgi-bin/.cvsignore
similarity index 100%
rename from wrap/python/cgi/.cvsignore
rename to wrap/python/cgi-bin/.cvsignore
diff --git a/wrap/python/cgi/.gitignore b/wrap/python/cgi-bin/.gitignore
similarity index 100%
rename from wrap/python/cgi/.gitignore
rename to wrap/python/cgi-bin/.gitignore
diff --git a/wrap/python/cgi/Makefile.am b/wrap/python/cgi-bin/Makefile.am
similarity index 100%
rename from wrap/python/cgi/Makefile.am
rename to wrap/python/cgi-bin/Makefile.am
diff --git a/wrap/python/cgi/README b/wrap/python/cgi-bin/README
similarity index 100%
rename from wrap/python/cgi/README
rename to wrap/python/cgi-bin/README
diff --git a/wrap/python/cgi/ltl2tgba.in b/wrap/python/cgi-bin/ltl2tgba.in
similarity index 100%
rename from wrap/python/cgi/ltl2tgba.in
rename to wrap/python/cgi-bin/ltl2tgba.in