diff --git a/ChangeLog b/ChangeLog
index 520114b44..bbcfe80fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-25  Damien Lefortier <dam@lrde.epita.fr>
+
+	* wrap/python/cgi/ltl2tgba.in: Use the uuid Python module instead
+	of the UNIQUE_ID environment variable to avoid being
+	Apache-specific.
+
 2010-01-24  Guillaume Sadegh  <sadegh@lrde.epita.fr>
 
 	Fix copyrights.
@@ -107,6 +113,7 @@
 	* README: Fit on 80 columns.
 
 2010-01-24  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
 	* README: Typo.
 
 2010-01-24  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
diff --git a/wrap/python/cgi/ltl2tgba.in b/wrap/python/cgi/ltl2tgba.in
index dbd0c2095..83d4050bc 100755
--- a/wrap/python/cgi/ltl2tgba.in
+++ b/wrap/python/cgi/ltl2tgba.in
@@ -28,6 +28,7 @@ import os
 import cgi
 import cgitb; cgitb.enable()
 import signal
+import uuid
 
 print "Content-Type: text/html"
 print
@@ -107,8 +108,7 @@ os.system('find ' + imgdir + ' -type f -amin +15 -print | xargs rm -f')
 myself = os.environ['SCRIPT_NAME'];
 form = cgi.FieldStorage()
 filled = form.has_key('formula')
-# FIXME: This assumes Apache.
-uid = os.environ['UNIQUE_ID'];
+uid = str(uuid.uuid1())
 imgprefix = imgdir + '/' + uid
 
 def escaped_print_set(dict, what):