diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed392b3a20f..8be0e2bb3dd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-26  Eli Zaretskii  <eliz@gnu.org>
+
+	* man.el (Man-getpage-in-background): Add windows-nt to the list
+	of systems where shell-file-name should be used instead of
+	literal "sh".
+
 2004-06-25  Sam Steingold  <sds@gnu.org>
 
 	* add-log.el (change-log-font-lock-keywords): Support Common Lisp
diff --git a/lisp/man.el b/lisp/man.el
index 5a07045dda9..cbfae21e44b 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -733,7 +733,9 @@ all sections related to a subject, put something appropriate into the
 	(if (fboundp 'start-process)
 	    (set-process-sentinel
 	     (start-process manual-program buffer
-			    (if (eq system-type 'cygwin) shell-file-name "sh")
+			    (if (memq system-type '(cygwin windows-nt))
+				shell-file-name
+			      "sh")
 			    shell-command-switch
 			    (format (Man-build-man-command) man-args))
 	     'Man-bgproc-sentinel)