diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f9beb676c..88ba6797b 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-03  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-clock.el (org-clock-select-task): Convert integer to
+	character for XEmacs.
+
+2009-12-02  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-clock.el (org-clock-resolve): Make reading a char XEmacs
+	compatible.
+
 2009-11-30  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* org.el (org-complete-tags-always-offer-all-agenda-tags): New
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index f598cc361..321dd952a 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -339,6 +339,7 @@ of a different task.")
 		    (if (< i 10)
 			(+ i ?0)
 		      (+ i (- ?A 10))) m))
+	   (if (fboundp 'int-to-char) (setq s (int-to-char s)))
 	   (push s sel-list)))
        org-clock-history)
       (org-fit-window-to-buffer)
@@ -700,12 +701,17 @@ was started."
 			     (goto-char (match-end 0)))
 			   nil))))))
 	      (let (char-pressed)
-		(while (null char-pressed)
-		  (setq char-pressed
-			(read-char (concat (funcall prompt-fn clock)
-					   " [(kK)eep (sS)ubtract (C)ancel]? ")
-				   nil 45)))
-		char-pressed))))
+		(if (featurep 'xemacs)
+		    (progn
+		      (message (concat (funcall prompt-fn clock)
+				       " [(kK)eep (sS)ubtract (C)ancel]? "))
+		      (setq char-pressed (read-char-exclusive)))
+		  (while (null char-pressed)
+		    (setq char-pressed
+			  (read-char (concat (funcall prompt-fn clock)
+					     " [(kK)eep (sS)ubtract (C)ancel]? ")
+				     nil 45)))
+		  char-pressed)))))
 	 (default (floor (/ (org-float-time
 			     (time-subtract (current-time) last-valid)) 60)))
 	 (keep (and (memq ch '(?k ?K))