diff --git a/doxygen-1.9.3.src.tar.gz b/doxygen-1.9.3.src.tar.gz
deleted file mode 100644
index 5d3a255..0000000
--- a/doxygen-1.9.3.src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0
-size 5152156
diff --git a/doxygen-1.9.4.src.tar.gz b/doxygen-1.9.4.src.tar.gz
new file mode 100644
index 0000000..69bc76c
--- /dev/null
+++ b/doxygen-1.9.4.src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a15e9cd8c0d02b7888bc8356eac200222ecff1defd32f3fe05257d81227b1f37
+size 5196383
diff --git a/doxygen-gcc12.patch b/doxygen-gcc12.patch
new file mode 100644
index 0000000..c06b4e1
--- /dev/null
+++ b/doxygen-gcc12.patch
@@ -0,0 +1,22 @@
+From 5198966c8d5fec89116d025c74934ac03ea511fa Mon Sep 17 00:00:00 2001
+From: Dimitri van Heesch <doxygen@gmail.com>
+Date: Fri, 6 May 2022 09:55:16 +0200
+Subject: [PATCH] issue #9312: Build: cache.h:53:14: error: 'exchange' is not a
+ member of 'std'
+
+---
+ src/cache.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cache.h b/src/cache.h
+index 0ff3092ed5..e218eb27d2 100644
+--- a/src/cache.h
++++ b/src/cache.h
+@@ -19,6 +19,7 @@
+ #include <list>
+ #include <unordered_map>
+ #include <mutex>
++#include <utility>
+ #include <ctype.h>
+ 
+ /*! Fixed size cache for value type V using keys of type K.
diff --git a/doxygen.changes b/doxygen.changes
index f29d763..cb6d86c 100644
--- a/doxygen.changes
+++ b/doxygen.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Jun 27 11:12:51 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 1.9.4. Check https://doxygen.nl/manual/changelog.html
+  for the complete changelog.
+  New features:
+  * Add CINDEX_NO_EXPORTS option when linking against static
+    libclang
+  * Introduce CREATE_SUBDIRS_LEVEL
+  * Add for the xml output also xml to the markdown image
+    representation.
+  * Adding Qt6 support
+  * Update Bulgarian translation
+  * Better translation for trPackageMembers
+  * Refer to chapter Grouping with GROUP_GRAPHS
+  * HTMLHELP warning on using svg as image format for graphs
+  * mention doxygen debugging flags on the web
+  * mention how to get additional usage flags
+- Add patch to fix build with GCC 12:
+  * doxygen-gcc12.patch
+
 -------------------------------------------------------------------
 Sun Feb 13 14:28:29 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/doxygen.spec b/doxygen.spec
index 0ca97c2..3f3729a 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           doxygen
-Version:        1.9.3
+Version:        1.9.4
 Release:        0
 Summary:        Automated C, C++, and Java Documentation Generator
 # qtools are used for building and they are GPL-3.0 licensed
@@ -34,6 +34,9 @@ Source0:        https://www.doxygen.nl/files/doxygen-%{version}.src.tar.gz
 Patch0:         %{name}-modify_footer.patch
 # suse specific
 Patch1:         %{name}-no-lowercase-man-names.patch
+# PATCH-FIX-UPSTREAM
+Patch2:         doxygen-gcc12.patch
+# The unified libclang-cpp library doesn't exist on older Leap / SLE
 Patch10:        doxygen-no-libclang-cpp.patch
 BuildRequires:  bison
 BuildRequires:  cmake >= 2.8.12
@@ -62,8 +65,10 @@ as well.
 
 %prep
 %setup -q
+# Leap 15 and SLE don't accept '%%autopatch -M'
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %if %{with libclang}
 %if 0%{?sle_version} == 150100 || (0%{?sle_version} == 150200 && !0%{?is_opensuse})
 %patch10 -p1
diff --git a/doxywizard.spec b/doxywizard.spec
index 0d04360..490ab05 100644
--- a/doxywizard.spec
+++ b/doxywizard.spec
@@ -17,7 +17,7 @@
 
 
 Name:           doxywizard
-Version:        1.9.3
+Version:        1.9.4
 Release:        0
 Summary:        Graphical User Interface for Doxygen
 # qtools are used for building and they are GPL-3.0 licensed
@@ -26,6 +26,8 @@ Group:          Development/Tools/Doc Generators
 URL:            https://www.doxygen.nl/
 Source:         https://www.doxygen.nl/files/doxygen-%{version}.src.tar.gz
 Source1:        doxywizard.desktop
+# PATCH-FIX-UPSTREAM
+Patch0:         doxygen-gcc12.patch
 BuildRequires:  bison
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  flex
@@ -55,7 +57,7 @@ Doxywizard is a graphical front-end to read/edit/write doxygen
 configuration files.
 
 %prep
-%setup -q -n doxygen-%{version}
+%autosetup -p1 -n doxygen-%{version}
 
 %build
 %cmake \