diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7721ae8a9..4b152ee61 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-07  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-exp.el (org-export-preprocess-string): Remove clock lines
+	earlier, so that they cannot cotribute to verbatim snippets.
+
 2009-02-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-exp.el (org-export-remove-or-extract-drawers): Fix regexp
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index aa8ac4b3e..da39ea37d 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1561,6 +1561,9 @@ on this string to produce the exported version."
       ;; Protect quoted subtrees
       (org-export-protect-quoted-subtrees)
 
+      ;; Remove clock lines
+      (org-export-remove-clock-lines)
+
       ;; Protect verbatim elements
       (org-export-protect-verbatim)
 
@@ -1568,7 +1571,6 @@ on this string to produce the exported version."
       (org-export-mark-blockquote-and-verse)
 
       ;; Remove timestamps, if the user has requested so
-      (org-export-remove-clock-lines)
       (unless (plist-get parameters :timestamps)
 	(org-export-remove-timestamps))