===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- mandoc/mandocdb.c	2013/10/27 16:41:31	1.75
+++ mandoc/mandocdb.c	2013/10/27 17:01:18	1.76
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.75 2013/10/27 16:41:31 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.76 2013/10/27 17:01:18 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -950,10 +950,6 @@ ofmerge(struct mchars *mc, struct mparse *mp, int chec
 		mparse_reset(mp);
 		mdoc = NULL;
 		man = NULL;
-		form = 0;
-		msec = of->dsec;
-		march = of->arch;
-		mtitle = of->name;
 		match = 1;
 
 		/*
@@ -965,7 +961,7 @@ ofmerge(struct mchars *mc, struct mparse *mp, int chec
 			lvl = mparse_readfd(mp, -1, of->file);
 			if (lvl < MANDOCLEVEL_FATAL)
 				mparse_result(mp, &mdoc, &man);
-		} 
+		}
 
 		if (NULL != mdoc) {
 			form = 1;
@@ -975,15 +971,20 @@ ofmerge(struct mchars *mc, struct mparse *mp, int chec
 		} else if (NULL != man) {
 			form = 1;
 			msec = man_meta(man)->msec;
-			march = "";
+			march = of->arch;
 			mtitle = man_meta(man)->title;
-		} 
+		} else {
+			form = 0;
+			msec = of->dsec;
+			march = of->arch;
+			mtitle = of->name;
+		}
 
-		if (NULL == msec) 
+		if (NULL == msec)
 			msec = "";
-		if (NULL == march) 
+		if (NULL == march)
 			march = "";
-		if (NULL == mtitle) 
+		if (NULL == mtitle)
 			mtitle = "";
 
 		/*