diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 586d14fcc..d6cdcd734 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-05  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-refile): Refile to clock only if the prefix arg is
+	2.
+
 2009-11-04  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-remember.el (org-remember-apply-template): Make sure the
diff --git a/lisp/org.el b/lisp/org.el
index 28aa9a21c..c87936376 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8955,7 +8955,8 @@ See also `org-refile-use-outline-path' and `org-completion-use-ido'"
     (if (equal goto '(16))
 	(org-refile-goto-last-stored)
       (when (or
-	     (and org-clock-hd-marker (marker-buffer org-clock-hd-marker)
+	     (and (equal goto 2)
+		  org-clock-hd-marker (marker-buffer org-clock-hd-marker)
 		  (prog1
 		      (setq it (list (or org-clock-heading "running clock")
 				     (buffer-file-name