1 files changed, 12 insertions, 3 deletions

diff --git a/miscutils/man.c b/miscutils/man.c
index 01155c8f0..fd5d90c1a 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -199,8 +199,7 @@ static char **add_MANPATH(char **man_path_list, int *count_mp, char *path)
         if (path) while (*path) {
                 char *next_path;
                 char **path_element;
-
-                next_path = strchr(path, ':');
+                next_path = strchr(path, PATH_SEP);
                 if (next_path) {
                         if (next_path == path) /* "::"? */
                                 goto next;
@@ -222,7 +221,7 @@ static char **add_MANPATH(char **man_path_list, int *count_mp, char *path)
                 if (!next_path)
                         break;
                 /* "path" may be a result of getenv(), be nice and don't mangle it */
-                *next_path = ':';
+                *next_path = PATH_SEP;
  next:
                 path = next_path + 1;
         }
@@ -302,6 +301,16 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         }
         config_close(parser);
 
+#if ENABLE_PLATFORM_MINGW32
+        {
+                char *exepath = xstrdup(bb_busybox_exec_path);
+                char *relpath = concat_path_file(dirname(exepath), "man");
+                man_path_list = add_MANPATH(man_path_list, &count_mp, relpath);
+                free(relpath);
+                free(exepath);
+        }
+#endif
+
         {
                 /* environment overrides setting from man.config */
                 char *env_pager = getenv("MANPAGER");