diff --git a/doc/org.texi b/doc/org.texi
index 6d92c3db6..e2e019f1e 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -8109,8 +8109,9 @@ assigns the following special CSS classes to appropriate parts of the
 document - your style specifications may change these, in addition to any of
 the standard classes like for headlines, tables etc.
 @example
-.todo              @r{TODO keywords}
-.done              @r{the DONE keyword}
+.todo              @r{TODO keywords, all not-done states}
+.done              @r{the DONE keywords, all stated the count as done}
+WAITING            @r{Each TODO keyword also uses a class named after itself}
 .timestamp         @r{time stamp}
 .timestamp-kwd     @r{keyword associated with a time stamp, like SCHEDULED}
 .tag               @r{tag in a headline}
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fe6598720..4b5ca0488 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-12  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-exp.el (org-export-as-html): Add TODO keyword as extra
+	class, so that each keyword can get special colors through CSS.
+
 	* org-clock.el (org-clock-out): Add another nil for the previous
 	state into the call to `org-add-log-setup'.
 
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index c40c6b210..9cd336c6e 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -3743,7 +3743,8 @@ lang=\"%s\" xml:lang=\"%s\">
 			    (if (member (match-string 2 line)
 					org-done-keywords)
 				"done" "todo")
-			    "\">" (match-string 2 line)
+			    " " (match-string 2 line)
+			    "\"> " (match-string 2 line)
 			    "</span>" (substring line (match-end 2)))))
 
 	  ;; Does this contain a reference to a footnote?