diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 1e1aae29f..e04c08cf3 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -2,6 +2,9 @@
 
 	* lisp/org-choose.el (org-choose-get-fn-map-group): Require
 	`org-agenda'.
+	(cl): Require `cl' at runtime.
+	(org-choose-filter-one): Use `org-split-string' for consistency
+	accross Emacs version.
 
 2009-02-12  Carsten Dominik  <carsten.dominik@gmail.com>
 
diff --git a/contrib/lisp/org-choose.el b/contrib/lisp/org-choose.el
index baa858420..9e07f797a 100644
--- a/contrib/lisp/org-choose.el
+++ b/contrib/lisp/org-choose.el
@@ -63,8 +63,9 @@
 ;;;_ , Requires
 
 (require 'org)
-(eval-when-compile
-   (require 'cl))
+;(eval-when-compile
+;   (require 'cl))
+(require 'cl)
 
 ;;;_. Body
 ;;;_ , The variables
@@ -109,7 +110,7 @@ Each entry is an `org-choose-mark-data.'" )
 	    ;;Split it
 	    (arglist
 	       (let
-		  ((arglist-x (split-string args ",")))
+		  ((arglist-x (org-split-string args ",")))
 		  ;;When string starts with "," `split-string' doesn't
 		  ;;make a first arg, so in that case make one
 		  ;;manually.