diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 111aabe69..464cde498 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-02  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-clock.el (org-clock-find-position): Better indentation of
+	new clock drawers.
+
 2009-03-01  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-agenda.el (org-agenda-quit): Delete window only when the
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 3f302a9d5..02f6b1896 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -444,12 +444,12 @@ the clocking selection, associated with the letter `d'."
 		(stringp org-clock-into-drawer)
 		(and (integerp org-clock-into-drawer)
 		     (< org-clock-into-drawer 2)))
+	(org-indent-line-function)
 	(insert ":" drawer ":\n:END:\n")
 	(beginning-of-line 0)
 	(org-indent-line-function)
 	(beginning-of-line 0)
 	(org-flag-drawer t)
-	(org-indent-line-function)
 	(beginning-of-line 2)
 	(or org-log-states-order-reversed
 	    (and (re-search-forward org-property-end-re nil t)