diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 3d8eee2623c1..c1a66c0e5401 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -156,6 +156,13 @@
FreeBSD-SA-05:04.ifconf.
&merged;
+ Several programming errors in &man.cvs.1;, which could
+ potentially cause arbitrary code to be executed on CVS servers,
+ have been corrected. Further information can be found in
+ security advisory
+ FreeBSD-SA-05:05.cvs.
+ &merged;
+
@@ -919,7 +926,7 @@
directory now include &man.bsdtar.1; instead of GNU tar.
The &man.restore.8; utility has regained the ability to read
- &os; version 1 dump tapes.
+ &os; version 1 dump tapes. &merged;
A bug of the &man.rexecd.8; utility which results in
it behaving as if the option is always
@@ -979,7 +986,7 @@
The &man.syslogd.8; utility now allows
: and %
characters in the hostname specifications.
- These characters are used in IPv6 addresses and scope IDs.
+ These characters are used in IPv6 addresses and scope IDs. &merged;The &man.systat.1; display is now
IPv6-aware. &merged;
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index 3d8eee2623c1..c1a66c0e5401 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -156,6 +156,13 @@
FreeBSD-SA-05:04.ifconf.
&merged;
+ Several programming errors in &man.cvs.1;, which could
+ potentially cause arbitrary code to be executed on CVS servers,
+ have been corrected. Further information can be found in
+ security advisory
+ FreeBSD-SA-05:05.cvs.
+ &merged;
+
@@ -919,7 +926,7 @@
directory now include &man.bsdtar.1; instead of GNU tar.
The &man.restore.8; utility has regained the ability to read
- &os; version 1 dump tapes.
+ &os; version 1 dump tapes. &merged;
A bug of the &man.rexecd.8; utility which results in
it behaving as if the option is always
@@ -979,7 +986,7 @@
The &man.syslogd.8; utility now allows
: and %
characters in the hostname specifications.
- These characters are used in IPv6 addresses and scope IDs.
+ These characters are used in IPv6 addresses and scope IDs. &merged;The &man.systat.1; display is now
IPv6-aware. &merged;