===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- mandoc/man_validate.c	2017/06/17 22:43:14	1.130
+++ mandoc/man_validate.c	2017/06/24 14:38:32	1.131
@@ -1,4 +1,4 @@
-/*	$OpenBSD: man_validate.c,v 1.130 2017/06/17 22:43:14 schwarze Exp $ */
+/*	$OpenBSD: man_validate.c,v 1.131 2017/06/24 14:38:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -173,7 +173,9 @@ check_root(CHKARGS)
 
 	if (man->meta.os_e &&
 	    (man->meta.rcsids & (1 << man->meta.os_e)) == 0)
-		mandoc_msg(MANDOCERR_RCS_MISSING, man->parse, 0, 0, NULL);
+		mandoc_msg(MANDOCERR_RCS_MISSING, man->parse, 0, 0,
+		    man->meta.os_e == MANDOC_OS_OPENBSD ?
+		    "(OpenBSD)" : "(NetBSD)");
 }
 
 static void
@@ -340,12 +342,14 @@ post_TH(CHKARGS)
 
 	if (n && (n = n->next))
 		man->meta.os = mandoc_strdup(n->string);
-	else if (man->defos != NULL)
-		man->meta.os = mandoc_strdup(man->defos);
-	man->meta.os_e = man->meta.os == NULL ? MDOC_OS_OTHER :
-	    strstr(man->meta.os, "OpenBSD") != NULL ? MDOC_OS_OPENBSD :
-	    strstr(man->meta.os, "NetBSD") != NULL ? MDOC_OS_NETBSD :
-	    MDOC_OS_OTHER;
+	else if (man->os_s != NULL)
+		man->meta.os = mandoc_strdup(man->os_s);
+	if (man->meta.os_e == MANDOC_OS_OTHER && man->meta.os != NULL) {
+		if (strstr(man->meta.os, "OpenBSD") != NULL)
+			man->meta.os_e = MANDOC_OS_OPENBSD;
+		else if (strstr(man->meta.os, "NetBSD") != NULL)
+			man->meta.os_e = MANDOC_OS_NETBSD;
+	}
 
 	/* TITLE MSEC DATE OS ->VOL<- */
 	/* If missing, use the default VOL name for MSEC. */