===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- mandoc/cgi.c	2016/05/28 13:40:48	1.132
+++ mandoc/cgi.c	2016/07/09 19:58:36	1.133
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.132 2016/05/28 13:40:48 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.133 2016/07/09 19:58:36 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@usta.de>
@@ -1026,7 +1026,7 @@ main(void)
 
 	if (*path != '\0') {
 		parse_path_info(&req, path);
-		if (access(path, F_OK) == -1)
+		if (req.q.manpath == NULL || access(path, F_OK) == -1)
 			path = "";
 	} else if ((querystring = getenv("QUERY_STRING")) != NULL)
 		parse_query_string(&req, querystring);