diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f020f9b2..71e26bbd2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-09  Bernt Hansen  <bernt@norang.ca>
+
+	* org-clock.el (org-clock-select-task): Make sure the selection
+	letters are 1-9 and A-Z, no special characters.
 
 2008-05-09  Carsten Dominik  <dominik@science.uva.nl>
 
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 2c750018f..c96a68a0a 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -109,7 +109,7 @@ of a different task.")
 
 (defun org-clock-history-push (&optional pos buffer)
   "Push a marker to the clock history."
-  (setq org-clock-history-length (max 1 (min 42 org-clock-history-length)))
+  (setq org-clock-history-length (max 1 (min 35 org-clock-history-length)))
   (let ((m (move-marker (make-marker) (or pos (point)) buffer)) n l)
     (while (setq n (member m org-clock-history))
       (move-marker (car n) nil))
@@ -158,7 +158,9 @@ of a different task.")
 	 (when (marker-buffer m)
 	   (setq i (1+ i)
 		 s (org-clock-insert-selection-line
-		    (+ i ?0) m))
+		    (if (< i 10)
+			(+ i ?0)
+		      (+ i (- ?A 10))) m))
 	   (push s sel-list)))
        org-clock-history)
       (if (fboundp 'fit-window-to-buffer)