===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.96
retrieving revision 1.98
diff -u -p -r1.96 -r1.98
--- mandoc/mandocdb.c	2014/01/02 22:44:10	1.96
+++ mandoc/mandocdb.c	2014/01/05 03:06:43	1.98
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.96 2014/01/02 22:44:10 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.98 2014/01/05 03:06:43 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -1024,9 +1024,19 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int
 			mpage->title =
 			    mandoc_strdup(mpage->mlinks->name);
 		}
+		putkey(mpage, mpage->sec, TYPE_sec);
+		putkey(mpage, '\0' == *mpage->arch ?
+		    "any" : mpage->arch, TYPE_arch);
 
-		for (mlink = mpage->mlinks; mlink; mlink = mlink->next)
+		for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {
+			if ('\0' != *mlink->dsec)
+				putkey(mpage, mlink->dsec, TYPE_sec);
+			if ('\0' != *mlink->fsec)
+				putkey(mpage, mlink->fsec, TYPE_sec);
+			putkey(mpage, '\0' == *mlink->arch ?
+			    "any" : mlink->arch, TYPE_arch);
 			putkey(mpage, mlink->name, TYPE_Nm);
+		}
 
 		if (warnings && !use_all) {
 			match = 0;