diff --git a/lisp/find-file.el b/lisp/find-file.el
index 3f0ac1ea0d9..b8aee680516 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -109,6 +109,8 @@
 ;; The *load-hooks allow you to place point where you want it in the other
 ;; file. 
 
+;;; Change Log:
+;;
 ;; FEEDBACK:
 ;; Please send me bug reports, bug fixes, and extensions, so that I can
 ;; merge them into the master source.
@@ -121,9 +123,9 @@
 ;; the development of this package:
 ;;     Rolf Ebert in particular, Fritz Knabe, Heddy Boubaker, Sebastian Kremer,
 ;;     Vasco Lopes Paulo, Mark A. Plaksin, Robert Lang, Trevor West, Kevin 
-;;     Pereira & Benedict Lofstedt.
+;;     Pereira, Benedict Lofstedt & Justin Vallon.
 
-;; Code:
+;;; Code:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; User definable variables:
 
@@ -199,7 +201,7 @@ may not exist.
 
 A typical format is 
 
-    '(\".\" \"/usr/include/*\" \"$PROJECT/*/include\")
+    '(\".\" \"/usr/include\" \"$PROJECT/*/include\")
 
 Environment variables can be inserted between slashes (`/').
 They will be replaced by their definition. If a variable does
@@ -210,7 +212,7 @@ the preceding slash.  The star represents all the subdirectories except
 `..', and each of these subdirectories will be searched in turn.")
 
 (defvar cc-search-directories
-  '("." "/usr/include/*" "/usr/local/include/*")
+  '("." "/usr/include" "/usr/local/include/*")
   "*See the description of the `ff-search-directories' variable.")
 
 (defvar cc-other-file-alist
@@ -563,14 +565,14 @@ Arguments: (search-dirs fname-stub &optional suffix-list)
           (message "finding buffer %s..." filename))
 
       (if (bufferp (get-buffer filename))
-          (setq found filename))
+          (setq found (buffer-file-name (get-buffer filename))))
 
       (setq blist (buffer-list))
       (setq buf (buffer-name (car blist)))
       (while (and blist (not found))
 
         (if (string-match (concat filename "<[0-9]+>") buf)
-            (setq found buf))
+            (setq found (buffer-file-name (car blist))))
 
         (setq blist (cdr blist))
         (setq buf (buffer-name (car blist))))