diff --git a/openmsx-18.0-gcc13.patch b/openmsx-18.0-gcc13.patch
new file mode 100644
index 0000000..e16db0c
--- /dev/null
+++ b/openmsx-18.0-gcc13.patch
@@ -0,0 +1,11 @@
+diff -durN openmsx-18.0.orig/src/utils/hash_set.hh openmsx-18.0/src/utils/hash_set.hh
+--- openmsx-18.0.orig/src/utils/hash_set.hh	2022-06-12 15:53:09.000000000 +0200
++++ openmsx-18.0/src/utils/hash_set.hh	2023-02-04 13:36:45.464895318 +0100
+@@ -11,6 +11,7 @@
+ #include "xrange.hh"
+ #include <cassert>
+ #include <cstdlib>
++#include <cstdint>
+ #include <functional>
+ #include <initializer_list>
+ #include <iterator>
diff --git a/openmsx.spec b/openmsx.spec
index bc6a346..e7e3666 100644
--- a/openmsx.spec
+++ b/openmsx.spec
@@ -2,15 +2,18 @@
 
 Name:           openmsx
 Version:        18.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An emulator for the MSX home computer system
 License:        GPLv2
 URL:            https://openmsx.org/
 Source0:        https://github.com/openMSX/openMSX/releases/download/RELEASE_%{pkgverdir}/%{name}-%{version}.tar.gz
 Source1:        https://github.com/openMSX/openMSX/releases/download/RELEASE_%{pkgverdir}/%{name}-catapult-%{version}.tar.gz
+# Fix compiling with GCC 13
+# https://github.com/openMSX/openMSX/issues/1487
+Patch0:         %{name}-18.0-gcc13.patch
 # Fix XRC warnings in wxWidgets 3.2.0. Whilst keeping things working with 3.0.
 # https://github.com/openMSX/wxcatapult/pull/44
-Patch0:         %{name}-18.0-wx32.patch
+Patch10:        %{name}-18.0-wx32.patch
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils libappstream-glib
 BuildRequires:  docbook-utils
@@ -54,8 +57,9 @@ to read the documentation of openMSX.
 
 %prep
 %autosetup -N -a 1
+%autopatch -p1 -M 9
 pushd %{name}-catapult-%{version}
-  %autopatch -p1 -m 0
+  %autopatch -p1 -m 10
 popd
 
 
@@ -227,6 +231,9 @@ appstream-util validate-relax --nonet \
 
 
 %changelog
+* Sat Feb 04 2023 Andrea Musuruane <musuruan@gmail.com> - 18.0-3
+- Fix compiling with GCC 13
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 18.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild