diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25839f53f..eb50565ce 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-19  Bastien Guerry  <bzg@altern.org>
+
+	* org-clock.el (org-clock-set-current): Just return the headline
+	itself, strip the TODO keyword, the priority cookie and the tags.
+
 2010-04-18  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-html.el (org-export-as-html-and-open): Add argument to
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 78e511324..b971a75a7 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1058,7 +1058,7 @@ the clocking selection, associated with the letter `d'."
   "Task currently clocked in.")
 (defun org-clock-set-current ()
   "Set `org-clock-current-task' to the task currently clocked in."
-  (setq org-clock-current-task (org-get-heading)))
+  (setq org-clock-current-task (nth 4 (org-heading-components))))
 (defun org-clock-delete-current ()
   "Reset `org-clock-current-task' to nil."
   (setq org-clock-current-task nil))