diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 99376363f..b85a71631 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-ctags.el (org-ctags-enable): Change order of functions.
+	(org-ctags-create-tags): Add wildcard to file name expansion.
+
 2010-01-17  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-entry-properties): Fix some important bugs.
diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el
index 297aad80d..2321d1adb 100644
--- a/lisp/org-ctags.el
+++ b/lisp/org-ctags.el
@@ -194,8 +194,8 @@ The following patterns are replaced in the string:
 (defun org-ctags-enable ()
   (put 'org-mode 'find-tag-default-function 'org-ctags-find-tag-at-point)
   (setq org-ctags-enabled-p t)
-  (dolist (fn (reverse org-ctags-open-link-functions))
-    (add-hook 'org-open-link-functions fn)))
+  (dolist (fn org-ctags-open-link-functions)
+    (add-hook 'org-open-link-functions fn t)))
   
 
 ;;; General utility functions. ===============================================
@@ -472,7 +472,7 @@ subdirectories contain large numbers of taggable files."
                      org-ctags-path-to-ctags
                      org-ctags-tag-regexp
                      (expand-file-name (concat dir-name "/TAGS"))
-                     (expand-file-name (concat dir-name "/")))))
+                     (expand-file-name (concat dir-name "/*")))))
       (cond
        ((eql 0 exitcode)
         (set (make-local-variable 'org-ctags-tag-list)