===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mandoc/cgi.c	2011/12/10 00:06:34	1.22
+++ mandoc/cgi.c	2011/12/10 10:59:21	1.23
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.22 2011/12/10 00:06:34 kristaps Exp $ */
+/*	$Id: cgi.c,v 1.23 2011/12/10 10:59:21 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -159,10 +159,17 @@ kval_query(struct query *q, const struct kval *fields,
 		q->whatis = 1;
 	}
 
-	/* Section "0" means no section when in legacy mode. */
+	/* 
+	 * Section "0" means no section when in legacy mode.
+	 * For some man.cgi scripts, "default" arch is none.
+	 */
 
-	if (q->legacy && NULL != q->sec && 0 == strcmp(q->sec, "0"))
-		q->sec = NULL;
+	if (q->legacy && NULL != q->sec)
+		if (0 == strcmp(q->sec, "0"))
+			q->sec = NULL;
+	if (q->legacy && NULL != q->arch)
+		if (0 == strcmp(q->arch, "default"))
+			q->arch = NULL;
 }
 
 /*