1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/paths.el b/lisp/paths.el
index de6c3eec79b..bfde5492ad2 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -109,7 +109,9 @@ Its name should end with a slash.")
 You may set this variable to nil in your `.emacs' file if you do not wish
 the terminal-initialization file to be loaded.")
 
-(defconst manual-program (if (eq system-type 'berkeley-unix)
+;; Solaris 2 has both of these files; prefer /usr/ucb/man
+;; because the other has nonstandard argument conventions.
+(defconst manual-program (if (file-exists-p "/usr/ucb/man")
                              "/usr/ucb/man" "/usr/bin/man")
   "Program to run to print man pages.")