diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common
index 5a710de3734f..787c0c138ca4 100644
--- a/contrib/groff/tmac/doc-common
+++ b/contrib/groff/tmac/doc-common
@@ -237,7 +237,11 @@
 .	if "\\$2"2.0.5"  .ds oS FreeBSD 2.0.5
 .	if "\\$2"2.1"    .ds oS FreeBSD 2.1
 .	if "\\$2"2.1.5"  .ds oS FreeBSD 2.1.5
+.	if "\\$2"2.1.6"  .ds oS FreeBSD 2.1.6
+.	if "\\$2"2.1.7"  .ds oS FreeBSD 2.1.7
 .	if "\\$2"2.2"    .ds oS FreeBSD 2.2
+.	if "\\$2"2.2.5"  .ds oS FreeBSD 2.2.5
+.	if "\\$2"3.0"    .ds oS FreeBSD 3.0
 .\}
 .if "\\*(oS"Null" .ds oS \0\\$1
 .if "\\*(aa"Non-Null" .as oS \0\\$2
diff --git a/contrib/groff/tmac/doc-syms b/contrib/groff/tmac/doc-syms
index 891930d1e48a..8e29e2c7a2f4 100644
--- a/contrib/groff/tmac/doc-syms
+++ b/contrib/groff/tmac/doc-syms
@@ -156,7 +156,9 @@
 .	if "\\$1"2.1"  \&\\*(tNFreeBSD\\*(aa 2.1\\*(aa\\$2
 .	if "\\$1"2.1.5"  \&\\*(tNFreeBSD\\*(aa 2.1.5\\*(aa\\$2
 .	if "\\$1"2.1.6"  \&\\*(tNFreeBSD\\*(aa 2.1.6\\*(aa\\$2
+.	if "\\$1"2.1.7"  \&\\*(tNFreeBSD\\*(aa 2.1.7\\*(aa\\$2
 .	if "\\$1"2.2"  \&\\*(tNFreeBSD\\*(aa 2.2\\*(aa\\$2
+.	if "\\$1"2.2.5"  \&\\*(tNFreeBSD\\*(aa 2.2.5\\*(aa\\$2
 .	if "\\$1"3.0"  \&\\*(tNFreeBSD\\*(aa 3.0\\*(aa\\$2
 .\}
 .if \\n(.$==1 \{\
@@ -165,13 +167,15 @@
 .	if "\\$1"2.1"  \&\\*(tNFreeBSD\\*(aa 2.1\\*(aa
 .	if "\\$1"2.1.5"  \&\\*(tNFreeBSD\\*(aa 2.1.5\\*(aa
 .	if "\\$1"2.1.6"  \&\\*(tNFreeBSD\\*(aa 2.1.6\\*(aa
+.	if "\\$1"2.1.7"  \&\\*(tNFreeBSD\\*(aa 2.1.7\\*(aa
 .	if "\\$1"2.2"  \&\\*(tNFreeBSD\\*(aa 2.2\\*(aa
+.	if "\\$1"2.2.5"  \&\\*(tNFreeBSD\\*(aa 2.2.5\\*(aa
 .	if "\\$1"3.0"  \&\\*(tNFreeBSD\\*(aa 3.0\\*(aa
 .\}
 ..
 .\" Ns Nx macro - NetBSD
 .\"
-.\" Please try to keep this macros in sync with NetBSD!
+.\" Please try to keep this macro in sync with NetBSD!
 .de Nx
 .nr cF \\n(.f
 .nr cZ \\n(.s