diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4149355552f..30623650b3c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.
+	(vc-default-dir-printer): Add a comment about updating this function.
+
+	* vc-git.el (vc-git-dir-printer): Use vc-dir-filename-mouse-map
+	for the file name.
+
 2009-02-11  Glenn Morris  <rgm@gnu.org>
 
 	* calendar/calendar.el (calendar-window-list): Ignore invisible windows.
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 81be5f10cd1..93e081c0f9b 100644
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -1146,7 +1146,7 @@ Interactively, a prefix argument means to ask for the backend."
    (propertize "Please add backend specific headers here.  It's easy!"
 	       'face 'font-lock-warning-face)))
 
-(defvar vc-dir-mouse-map
+(defvar vc-dir-filename-mouse-map
    (let ((map (make-sparse-keymap)))
      (define-key map [mouse-2] 'vc-dir-find-file-other-window)
     map)
@@ -1155,6 +1155,9 @@ Interactively, a prefix argument means to ask for the backend."
 (defun vc-default-dir-printer (backend fileentry)
   "Pretty print FILEENTRY."
   ;; If you change the layout here, change vc-dir-move-to-goal-column.
+  ;; VC backends can implement backend specific versions of this
+  ;; function.  Changes here might need to be reflected in the
+  ;; vc-BACKEND-dir-printer functions.
   (let* ((isdir (vc-dir-fileinfo->directory fileentry))
 	(state (if isdir "" (vc-dir-fileinfo->state fileentry)))
 	(filename (vc-dir-fileinfo->name fileentry)))
@@ -1179,7 +1182,7 @@ Interactively, a prefix argument means to ask for the backend."
 	  "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu"
 	"File\nmouse-3: Pop-up menu")
       'mouse-face 'highlight
-      'keymap vc-dir-mouse-map))))
+      'keymap vc-dir-filename-mouse-map))))
 
 (defun vc-default-extra-status-menu (backend)
   nil)
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index b195124dee2..64d598c271a 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -302,6 +302,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 		 (if isdir
 		     "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu"
 		   "File\nmouse-3: Pop-up menu")
+		 'keymap vc-dir-filename-mouse-map
 		 'mouse-face 'highlight)
      (vc-git-file-type-as-string old-perm new-perm)
      (vc-git-rename-as-string state extra))))