diff --git a/groff/PKGBUILD b/groff/PKGBUILD
index 9d59895..e86b5de 100644
--- a/groff/PKGBUILD
+++ b/groff/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=groff
 pkgver=1.23.0
-pkgrel=03
+pkgrel=04
 pkgdesc='GNU troff text-formatting system'
 url='https://www.gnu.org/software/groff/groff.html'
 groups=( jobbot )
@@ -72,7 +72,7 @@ validpgpkeys=('2D0C08D2B0AD0D3D8626670272D23FBAC99D4E75') # Bertrand Garrigues <
 sha256sums=(6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13  # groff-1.23.0.tar.gz
 	7ec23a8550fba8d942da06b1f84a090d80538ac062e8c73de6a4ad7a4f69e09f  # groff-1.23.0.tar.gz.sig
 	489bb32bbd1c7bced33bf187611219527914ae46ce05238fe80dc11c4b1bb909  # display-utc-times.patch
-	f0b8a69d8dc51fe6812d3c7adbdba59b8206cfa952f2ce3ee7ff7f5412903018) # site.tmac
+	cbcfe19bc1271b91e2c3bb8864813118863a3d8d10e6ca341f82c0ca5dc37dff) # site.tmac
 
-##  4da0252c193f24a97929218bd434cbfbdd3ffb967f5903c618491a9115abacb7  groff-1.23.0-03-x86_64.pkg.tar.lz
+##  27aed052864aab603587ce4924c8a76841663bf2ab5be0d95fa9641e9b479e41  groff-1.23.0-04-x86_64.pkg.tar.lz
 
diff --git a/groff/PKGBUILD-arch b/groff/PKGBUILD-arch
index ad62a75..b87fdd1 100644
--- a/groff/PKGBUILD-arch
+++ b/groff/PKGBUILD-arch
@@ -1,8 +1,8 @@
-# Maintainer: 
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=groff
 pkgver=1.23.0
-pkgrel=3
+pkgrel=4
 pkgdesc='GNU troff text-formatting system'
 arch=('x86_64')
 url='https://www.gnu.org/software/groff/groff.html'
@@ -21,7 +21,7 @@ source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
 sha256sums=('6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13'
             'SKIP'
             '489bb32bbd1c7bced33bf187611219527914ae46ce05238fe80dc11c4b1bb909'
-            'f0b8a69d8dc51fe6812d3c7adbdba59b8206cfa952f2ce3ee7ff7f5412903018')
+            'cbcfe19bc1271b91e2c3bb8864813118863a3d8d10e6ca341f82c0ca5dc37dff')
 
 prepare() {
   cd $pkgname-$pkgver
diff --git a/groff/site.tmac b/groff/site.tmac
index 7c04fdc..33ba260 100644
--- a/groff/site.tmac
+++ b/groff/site.tmac
@@ -1,10 +1,29 @@
 .
 .if n \{\
-.  \" Character translations for non-keyboard
-.  \" characters - to make them searchable
+.  \" Strictly, "-" is a hyphen while "\-" is a minus sign, and the
+.  \" former may not always be rendered in the form expected for things like
+.  \" command-line options.  Uncomment this if you want to make sure that
+.  \" manual pages you're writing are clear of this problem.
+.  \" if '\*[.T]'utf8' \
+.  \"   char - \[hy]
+.
+.  \" groff 1.23.0 changed the "utf8" device to render "^" and "~"
+.  \" as U+02C6 and U+02DC respectively.  This is likely to cause
+.  \" considerable disruption in manual pages, so preserve the old
+.  \" behaviour, at least for now.
 .  if '\*[.T]'utf8' \{\
+.    char ^ \[ha]
+.    char ~ \[ti]
+.  \}
+.
+.  \" "\-" is more commonly used for option dashes than for minus
+.  \" signs in manual pages, so map it to plain "-" for HTML/XHTML output
+.  \" rather than letting it be rendered as "&minus;".
+.  ie '\*[.T]'html' \
 .    char \- \N'45'
-.    char - \N'45'
-.    char ' \N'39'
+.  el \{\
+.    if '\*[.T]'xhtml' \
+.      char \- \N'45'
 .  \}
 .\}
+
diff --git a/groff/site.tmac.1 b/groff/site.tmac.1
new file mode 100644
index 0000000..7c04fdc
--- /dev/null
+++ b/groff/site.tmac.1
@@ -0,0 +1,10 @@
+.
+.if n \{\
+.  \" Character translations for non-keyboard
+.  \" characters - to make them searchable
+.  if '\*[.T]'utf8' \{\
+.    char \- \N'45'
+.    char - \N'45'
+.    char ' \N'39'
+.  \}
+.\}