diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ed1d26e7c204f55752599e36a9d2e80c3d26d4d..e5cc3af773c9fa254d3d9cd60d31925531241cbd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-02-09 Masatake YAMATO  <jet@gyve.org>
 
+	* dired-x.el (dired-guess-shell-alist-default): Add .man as
+	a `dired-man' target.
+	
 	* progmodes/autoconf.el (autoconf-font-lock-keywords): Check start 
 	boundary of symbols.
 
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index da9fc2848012fd3f8b18a9e91ff78fed581042e4..e207c60502dfb40c702c2b8db06e2b2e1a893fc5 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1027,11 +1027,11 @@ dired."
                   " " dired-guess-shell-znew-switches))
 
    ;; The following four extensions are useful with dired-man ("N" key)
-   (list "\\.[0-9]$" '(progn (require 'man)
+   (list "\\.\\(?:[0-9]\\|man\\)$" '(progn (require 'man)
                              (if (Man-support-local-filenames)
                                  "man -l"
                                "cat * | tbl | nroff -man -h")))
-   (list "\\.[0-9]\\.g?z$" '(progn (require 'man)
+   (list "\\.\\(?:[0-9]\\|man\\)\\.g?z$" '(progn (require 'man)
                                    (if (Man-support-local-filenames)
                                        "man -l"
                                      "gunzip -qc * | tbl | nroff -man -h"))