diff --git a/tutorial/manpages b/tutorial/manpages
index 0ddde8964fcb2245da66a9d015475f3cc18b823a..c94e7bd16a6463dff40f5901ba775c4f27d75b1c 100644
--- a/tutorial/manpages
+++ b/tutorial/manpages
@@ -144,9 +144,10 @@ void make_page(string base, TAG tag, string ind, string fbase)
      string t=ctime(time());
      f->write(strip_eightbit(".\\\" t\n"
 			     ".\\\" automatically generated from wmml\n"
-			     ".TH "+names*","+" "+upper_case(obase)+" \""+
-			     t[8..9]+t[3..7]+t[20..23]+"\" Pike \"Pike Manual\"\n"
-			     +page+"\n"));
+			     ".TH " + names*"," + " " + upper_case(obase) +
+			     " \"" + t[8..9] + t[3..7] + t[20..23] + "\""
+			     " Pike \"Pike Manual\"\n" +
+			     page + "\n"));
      f->close();
 
      foreach (outfiles[1..], string s)
@@ -163,7 +164,7 @@ void make_page(string base, TAG tag, string ind, string fbase)
        windex->write(sprintf("%-15s %-15s - %s\n",
 			     s,q+" ("+obase+")",
 			     tag->params->title || (names*", ")));
-       whatis->write(sprintf("%-23s - %s\n", s,
+       whatis->write(sprintf("%-23s - %s\n", s  + " (" + obase + ")",
 			     tag->params->title || (names*", ")));
      }