diff --git a/contrib/groff/tmac/tmac.tty-char b/contrib/groff/tmac/tmac.tty-char
index f66d7a858e51..d9706a8b771a 100644
--- a/contrib/groff/tmac/tmac.tty-char
+++ b/contrib/groff/tmac/tmac.tty-char
@@ -195,4 +195,4 @@
 .\"tty-char \(:y \ij
 .tty-char \[arrowvertex] |
 .cp \n(_C
-.do mso tmac.latin1
+.ie "\*[.T]"latin1" .do mso tmac.latin1
diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc
index 46791ac676de..823814278240 100644
--- a/contrib/groff/tmac/troffrc
+++ b/contrib/groff/tmac/troffrc
@@ -18,7 +18,8 @@
 .	do mso \*[troffrc!\*[.T]]
 .do rm troffrc!ps troffrc!Xps troffrc!dvi troffrc!X75 troffrc!X75-12 \
 troffrc!X100 troffrc!X100-12 troffrc!lj4
-.do tr \[char160]
+.ie "\*[.T]"koi8-r" .do tr \[char154]
+.el .if "\*[.T]"latin1" .do tr \[char160]
 .\" Set the hyphenation language to `us' unless we're using koi8-r (russian)
 .\" Load hyphenation patterns from `hyphen.us' (in the tmac directory).
 .ie "\*[.T]"koi8-r" \{\