diff --git a/var/spack/repos/builtin/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py
index b0dfb4d3be..ba81ed6b6c 100644
--- a/var/spack/repos/builtin/packages/doxygen/package.py
+++ b/var/spack/repos/builtin/packages/doxygen/package.py
@@ -19,6 +19,7 @@ class Doxygen(CMakePackage):
     git       = "https://github.com/doxygen/doxygen.git"
 
     # Doxygen versions on GitHub
+    version('1.9.4',  commit='5d15657a55555e6181a7830a5c723af75e7577e2')
     version('1.9.3',  commit='6518ff3d24ad187b7072bee854d69e285cd366ea')
     version('1.9.2',  commit='caa4e3de211fbbef2c3adf58a6bd4c86d0eb7cb8')
     version('1.9.1',  commit='ef9b20ac7f8a8621fcfc299f8bd0b80422390f4b')
@@ -89,6 +90,9 @@ def determine_variants(cls, exes, version_str):
     # Workaround for gcc getting stuck in an infinite loop
     patch('gcc-partial-inlining-bug.patch', when='@1.8.20: %gcc@7')
 
+    # https://github.com/doxygen/doxygen/issues/9312
+    patch('https://github.com/doxygen/doxygen/commit/5198966c8d5fec89116d025c74934ac03ea511fa.patch?full_index=1', sha256='94a93f869a2dc63014ec4e9f1a31a45eefcab63931823979fdb4502f0caf625f', when='@1.9.4 %gcc@12:')
+
     # Some GCC 7.x get stuck in an infinite loop
     conflicts('%gcc@7.0:7.9', when='@1.9:')