===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- mandoc/cgi.c	2014/07/25 17:34:06	1.86
+++ mandoc/cgi.c	2014/07/25 17:52:04	1.87
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.86 2014/07/25 17:34:06 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.87 2014/07/25 17:52:04 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -874,8 +874,9 @@ format(const struct req *req, const char *file)
 	}
 
 	snprintf(opts, sizeof(opts), "fragment,man=%s?"
-	    "manpath=%s&amp;query=%%N&amp;sec=%%S&amp;arch=%s",
+	    "manpath=%s&query=%%N&sec=%%S%s%s",
 	    scriptname, req->q.manpath,
+	    req->q.arch ? "&arch=" : "",
 	    req->q.arch ? req->q.arch : "");
 
 	mparse_result(mp, &mdoc, &man, NULL);