diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 813c3cd0a3f..dc63a588f2a 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4364,7 +4364,7 @@ hard-coded.")
            autoconf-archive
            automake
            `(,glib "bin") ; for glib-genmarshal, etc.
-           gtk-doc
+           gtk-doc/stable
            pkg-config))
     (inputs
      (list dbus-glib libevdev libxml2 upower xz))
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 8d90a83e6af..56942ee5ec4 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -531,7 +531,7 @@ functions for strings and common data structures.")
        `(("docbook-xml-4.2" ,docbook-xml-4.2)
          ("docbook-xml-4.5" ,docbook-xml)
          ("docbook-xsl" ,docbook-xsl)
-         ("gtk-doc" ,gtk-doc)
+         ("gtk-doc" ,gtk-doc/stable)
          ("libxml2" ,libxml2)
          ("xsltproc" ,libxslt)
          ,@(package-native-inputs base)))
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index a693156d2be..f83d26b26bf 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -241,7 +242,7 @@ themes for both gtk+-2 and gtk+-3.")
            `(,glib "bin")
            gobject-introspection
            yelp-tools
-           gtk-doc))
+           gtk-doc/stable))
     (inputs
      (list gtk+ libxrandr iso-codes startup-notification))
     (propagated-inputs
@@ -736,7 +737,7 @@ infamous 'Wanda the Fish'.")
            yelp-tools
            (list glib "bin")
            gobject-introspection
-           gtk-doc
+           gtk-doc/stable
            texlive-bin  ;synctex
            libxml2
            zlib))
@@ -882,25 +883,27 @@ icons on the MATE desktop.  It works on local and remote file systems.")
                                (string-append "--with-cajadir="
                                               (assoc-ref %outputs "out")
                                               "/lib/caja/extensions-2.0/"))))
-    (native-inputs `(("intltool" ,intltool)
-                     ("gettext" ,gettext-minimal)
-                     ("glib:bin" ,glib "bin")
-                     ("gobject-introspection" ,gobject-introspection)
-                     ("gtk-doc" ,gtk-doc)
-                     ("libxml2" ,libxml2)
-                     ("pkg-config" ,pkg-config)))
-    (inputs (list attr
-                  brasero
-                  caja
-                  dbus
-                  dbus-glib
-                  gajim ;runtime only?
-                  gst-plugins-base
-                  gtk+
-                  graphicsmagick
-                  mate-desktop
-                  pidgin ;runtime only?
-                  startup-notification))
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc/stable)
+       ("libxml2" ,libxml2)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     (list attr
+           brasero
+           caja
+           dbus
+           dbus-glib
+           gajim ;runtime only?
+           gst-plugins-base
+           gtk+
+           graphicsmagick
+           mate-desktop
+           pidgin ;runtime only?
+           startup-notification))
     (home-page "https://mate-desktop.org/")
     (synopsis "Extensions for the File manager Caja")
     (description
@@ -1257,7 +1260,7 @@ can be used as backgrounds in the MATE Desktop environment.")
      (list #:parallel-build? #f))
     (native-inputs
      (list gettext-minimal
-           gtk-doc
+           gtk-doc/stable
            intltool
            libice
            libsm
@@ -1311,7 +1314,7 @@ can be used as backgrounds in the MATE Desktop environment.")
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list gettext-minimal
-           gtk-doc
+           gtk-doc/stable
            gobject-introspection
            intltool
            pkg-config
@@ -1375,7 +1378,7 @@ can be used as backgrounds in the MATE Desktop environment.")
              #t)))))
     (native-inputs
      `(("gettext" ,gettext-minimal)
-       ("gtk-doc" ,gtk-doc)
+       ("gtk-doc" ,gtk-doc/stable)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
        ("yelp-tools" ,yelp-tools)))
@@ -1415,7 +1418,7 @@ can be used as backgrounds in the MATE Desktop environment.")
        #:tests? #f))
     (native-inputs
      `(("gettext" ,gettext-minimal)
-       ("gtk-doc" ,gtk-doc)
+       ("gtk-doc" ,gtk-doc/stable)
        ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)
        ("libtool" ,libtool)
@@ -1499,7 +1502,7 @@ MATE Desktop to monitor your system resources and usage.")
          "1s2ac2p5smiwr7lf4snciyb9waclychjmzrw32f2qspdm381s2im"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
-     (list gettext-minimal gtk-doc intltool libtool pkg-config))
+     (list gettext-minimal gtk-doc/stable intltool libtool pkg-config))
     (inputs
      (list accountsservice
            glib
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 641974d0816..c72ce744368 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -28,6 +28,7 @@
 ;;; Copyright © 2020, 2022 Raghav Gururajan <rg@raghavgururajan.name>
 ;;; Copyright © 2020, 2021 Robert Karszniewicz <avoidr@posteo.de>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2021, 2024 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
@@ -288,7 +289,7 @@ XMPP-based sessions.")
      (list docbook-xml-4.1.2
            `(,glib "bin")
            gobject-introspection
-           gtk-doc
+           gtk-doc/stable
            pkg-config))
     (inputs (list ncurses))
     (propagated-inputs (list glib libxml2 python-2))
@@ -2122,7 +2123,7 @@ including psyced.")
     (native-inputs
      (list pkg-config check
            `(,glib "bin") ; gtester
-           gtk-doc))
+           gtk-doc/stable))
     (home-page "https://mcabber.com/")
     (description
      "Loudmouth is a lightweight and easy-to-use C library for programming
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ad3113ddf20..341458d9555 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -44,6 +44,7 @@
 ;;; Copyright © 2021 Simon Streit <simon@netpanic.org>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2021 Thomas Albers Raviola <thomas@thomaslabs.org>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022, 2023 Sughosha <sughosha@disroot.org>
 ;;; Copyright © 2022 Remco van 't Veer <remco@remworks.net>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@@ -914,7 +915,7 @@ many input formats and provides a customisable Vi-style user interface.")
     (native-inputs
      (list diffutils
            `(,glib "bin")               ; for gtester
-           gtk-doc
+           gtk-doc/stable
            intltool
            libtool
            pkg-config))
@@ -5538,7 +5539,7 @@ studio.")
            cunit
            gettext-minimal
            gobject-introspection
-           gtk-doc
+           gtk-doc/stable
            libtool
            libxslt
            pkg-config
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index b6931c67760..96f5bbec50d 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2020 Sebastian Schott <sschott@mailbox.org>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020. 2021, 2022, 2024 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
@@ -723,7 +724,7 @@ such as Batch image processing.")
            gettext-minimal
            `(,glib "bin")
            gobject-introspection
-           gtk-doc
+           gtk-doc/stable
            itstool
            libxml2
            perl
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 4e43cb818b5..5abb461c0c3 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2018, 2019 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2020 Raphaël Mélotte <raphael.melotte@mind.be>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 Antero Mejr <antero@kodmin.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021 Sergey Trofimov <sarg@sarg.org.ru>
@@ -665,7 +666,7 @@ operations.")
            gengetopt
            help2man
            pkg-config
-           gtk-doc
+           gtk-doc/stable
            which))
     (home-page "https://developers.yubico.com/libu2f-server/")
     ;; TRANSLATORS: The U2F protocol has a "server side" and a "host side".
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index cb9ea62bb03..f41dd7bea5e 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -44,6 +44,7 @@
 ;;; Copyright © 2021, 2023, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 lasnesne <lasnesne@lagunposprasihopre.org>
 ;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2021, 2023 jgart <jgart@dismail.de>
@@ -1386,7 +1387,7 @@ all of them.  Currently supported window managers include:
     (inputs
      (list gtk+ gobject-introspection))
     (native-inputs
-     (list gtk-doc pkg-config))
+     (list gtk-doc/stable pkg-config))
     (synopsis "Library for registering global keyboard shortcuts, Gtk3 version")
     (description
      "Keybinder is a library for registering global keyboard shortcuts.