diff --git a/.gitignore b/.gitignore
index 64ac1a4..01566ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/meson-0.56.2.tar.gz
+SOURCES/meson-0.58.2.tar.gz
diff --git a/.meson.metadata b/.meson.metadata
index b362165..5fa6c73 100644
--- a/.meson.metadata
+++ b/.meson.metadata
@@ -1 +1 @@
-a62199aca12eb69d4df7e828a8d11cc241ecff73 SOURCES/meson-0.56.2.tar.gz
+4058a574a8a1335102b24981d049fd82ccdb4150 SOURCES/meson-0.58.2.tar.gz
diff --git a/SOURCES/meson-gcc11.patch b/SOURCES/meson-gcc11.patch
deleted file mode 100644
index 11f34c9..0000000
--- a/SOURCES/meson-gcc11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 1faa128..3c7f378 100644
---- a/mesonbuild/modules/gnome.py
-+++ b/mesonbuild/modules/gnome.py
-@@ -1417,7 +1417,7 @@ class GnomeModule(ExtensionModule):
- GType
- %s@enum_name@_get_type (void)
- {
--  static volatile gsize gtype_id = 0;
-+  static gsize gtype_id = 0;
-   static const G@Type@Value values[] = {''' % func_prefix
- 
-         c_file_kwargs['vprod'] = '    { C_@TYPE@(@VALUENAME@), "@VALUENAME@", "@valuenick@" },'
diff --git a/SPECS/meson.spec b/SPECS/meson.spec
index 31c8233..d6e9f0f 100644
--- a/SPECS/meson.spec
+++ b/SPECS/meson.spec
@@ -6,14 +6,13 @@
 %bcond_with check
 
 Name:           meson
-Version:        0.56.2
-Release:        4%{?dist}
+Version:        0.58.2
+Release:        1%{?dist}
 Summary:        High productivity build system
 
 License:        ASL 2.0
 URL:            https://mesonbuild.com/
 Source:         https://github.com/mesonbuild/meson/releases/download/%{version_no_tilde .}/meson-%{version_no_tilde %{quote:}}.tar.gz
-Patch0:         %{name}-gcc11.patch
 
 BuildArch:      noarch
 
@@ -113,6 +112,10 @@ export MESON_PRINT_TEST_OUTPUT=1
 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy
 
 %changelog
+* Fri Sep 24 2021 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 0.58.2-1
+- Update to 0.58.2
+  Resolves: rhbz#1997067
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com>
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688