diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 140806eca..0dca35dbd 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-05  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-timer.el (org-timer-set-timer): Set variables
+	org-timer-timer[123] correctly.
+
+
 	* org-mobile.el (org-mobile-files-alist): Make it work when
 	`agenda-archives' is included in
 	`org-agenda-text-search-extra-files'.
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 8a59c747e..660312a09 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -312,12 +312,12 @@ VALUE can be `on', `off', or `pause'."
 		(t (error "Not in an Org buffer"))))
 	   timer-set)
       (mapcar (lambda(timer)
-		(if (not (or (eval timer) timer-set))
-		    (setq timer-set t
-			  timer
-			  (run-with-timer
-			   secs nil 'org-notify (format "%s: time out" hl) t)
-			  org-timer-last-timer timer)))
+		(when (not (or (eval timer) timer-set))
+		  (setq timer-set t)
+		  (setq org-timer-last-timer
+			(run-with-timer
+			secs nil 'org-notify (format "%s: time out" hl) t))
+		  (set timer org-timer-last-timer)))
 	      '(org-timer-timer1
 		org-timer-timer2
 		org-timer-timer3)))))