diff --git a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
index 17eeea9c34..05a1ee79e9 100644
--- a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
@@ -1105,6 +1105,7 @@ int
 main(void)
 {
     printf("hello, world\n");
+    return 0;
 }<tag class="endtag">programlisting</tag></programlisting>
 
 	<para>Notice how the angle brackets in the
@@ -1121,6 +1122,7 @@ int
 main(void)
 {
     printf("hello, world\n");
+    return 0;
 }</programlisting>
       </example>
     </sect2>
diff --git a/en_US.ISO8859-1/share/xml/teams.ent b/en_US.ISO8859-1/share/xml/teams.ent
index 13857b09d6..c348944c14 100644
--- a/en_US.ISO8859-1/share/xml/teams.ent
+++ b/en_US.ISO8859-1/share/xml/teams.ent
@@ -17,7 +17,7 @@
 
 <!ENTITY a.admins "FreeBSD Administrators <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
-<!ENTITY a.bugmeister "Problem Report Database administrators <email xmlns='http://docbook.org/ns/docbook'>bugmeister@FreeBSD.org</email>">
+<!ENTITY a.clusteradm "Cluster Admin Team <email xmlns='http://docbook.org/ns/docbook'>clusteradm@FreeBSD.org</email>">
 
 <!ENTITY a.core "Core Team <email xmlns='http://docbook.org/ns/docbook'>core@FreeBSD.org</email>">