===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -p -r1.312 -r1.313
--- mandoc/roff.c	2017/06/14 22:51:25	1.312
+++ mandoc/roff.c	2017/06/17 22:43:14	1.313
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.312 2017/06/14 22:51:25 schwarze Exp $ */
+/*	$Id: roff.c,v 1.313 2017/06/17 22:43:14 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -1166,6 +1166,7 @@ roff_res(struct roff *r, struct buf *buf, int ln, int 
 	size_t		 maxl;  /* expected length of the escape name */
 	size_t		 naml;	/* actual length of the escape name */
 	enum mandoc_esc	 esc;	/* type of the escape sequence */
+	enum mdoc_os	 os_e;	/* kind of RCS id seen */
 	int		 inaml;	/* length returned from mandoc_escape() */
 	int		 expand_count;	/* to avoid infinite loops */
 	int		 npos;	/* position in numeric expression */
@@ -1183,6 +1184,23 @@ roff_res(struct roff *r, struct buf *buf, int ln, int 
 		stesc++;
 		if (*stesc != '"' && *stesc != '#')
 			continue;
+
+		/* Comment found, look for RCS id. */
+
+		if ((cp = strstr(stesc, "$" "OpenBSD")) != NULL) {
+			os_e = MDOC_OS_OPENBSD;
+			cp += 8;
+		} else if ((cp = strstr(stesc, "$" "NetBSD")) != NULL) {
+			os_e = MDOC_OS_NETBSD;
+			cp += 7;
+		}
+		if (cp != NULL &&
+		    isalnum((unsigned char)*cp) == 0 &&
+		    strchr(cp, '$') != NULL)
+			r->man->meta.rcsids |= 1 << os_e;
+
+		/* Handle trailing whitespace. */
+
 		cp = strchr(stesc--, '\0') - 1;
 		if (*cp == '\n') {
 			done = 1;