diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 205de8e225d..8d92daeb338 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -164,6 +164,16 @@
More details can be found in security advisory FreeBSD-SA-04:05.
&merged;
+
+ A programming error in the handling of some IPv6
+ socket options within the &man.setsockopt.2; system call
+ has been fixed. This allows a local attacker to cause a
+ system panic, and may allow to gain unauthorized access to
+ parts of kernel memory, possibly resulting in disclosure
+ of sensitive information, bypass of access control
+ mechanisms, or privilege escalation.
+ More details can be found in security advisory FreeBSD-SA-04:06.
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 205de8e225d..8d92daeb338 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -164,6 +164,16 @@
More details can be found in security advisory FreeBSD-SA-04:05.
&merged;
+
+ A programming error in the handling of some IPv6
+ socket options within the &man.setsockopt.2; system call
+ has been fixed. This allows a local attacker to cause a
+ system panic, and may allow to gain unauthorized access to
+ parts of kernel memory, possibly resulting in disclosure
+ of sensitive information, bypass of access control
+ mechanisms, or privilege escalation.
+ More details can be found in security advisory FreeBSD-SA-04:06.