===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- mandoc/mandocdb.c	2017/01/27 00:56:32	1.238
+++ mandoc/mandocdb.c	2017/01/27 01:04:25	1.239
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.238 2017/01/27 00:56:32 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.239 2017/01/27 01:04:25 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -869,6 +869,20 @@ filescan(const char *file)
 		say(start, "Filename too long");
 		free(mlink);
 		return;
+	}
+
+	/*
+	 * In test mode or when the original name is absolute
+	 * but outside our tree, guess the base directory.
+	 */
+
+	if (op == OP_TEST || (start == buf && *start == '/')) {
+		if (strncmp(buf, "man/", 4) == 0)
+			start = buf + 4;
+		else if ((start = strstr(buf, "/man/")) != NULL)
+			start += 5;
+		else
+			start = buf;
 	}
 
 	/*