Index: en_US.ISO8859-1/htdocs/cgi/monthly.cgi
===================================================================
--- en_US.ISO8859-1/htdocs/cgi/monthly.cgi
+++ en_US.ISO8859-1/htdocs/cgi/monthly.cgi
@@ -58,6 +58,27 @@
 	return map { "$Spaces$_\n" } @Text;
 }
 
+sub bodyformat
+{
+	my($Indent, $pars) = @_;
+	my $text = "";
+	my $first = true;
+	my @pars = split("\n\n", $pars);
+
+	foreach my $par @pars
+	{
+		my @lines = split("\n", $par);
+		$text += xml($Indent + 1, "p", @lines);
+		if (! $first)
+		{
+			$text += "\n";
+			$first = false;
+		}
+	}
+
+	return xml($Indent, "body", split("\n", $text));
+}
+
 if ($Submit)
 {
 	my $errors = 0;
@@ -151,7 +172,6 @@
 	push(@hidden, hidden("SubmittedInfo"));
 
 	$info =~ s/\r//g;
-	my @info = split("\n", $info);
 
 	my $title = "FreeBSD project submission output";
 
@@ -162,8 +182,7 @@
 	    "\n",
             xml(1, "links", "", @links),
             "\n",
-            xml(1, "body",
-                xml(2, "p", "", xmltext(3, @info))),
+            bodyformat(1, $info),
             "\n",
             @sponsors,
             xml(1, "help", "", @tasks),