diff --git a/.gitignore b/.gitignore
index 3fb1840..cceb6ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,5 @@
 /uwsgi-docs-b9da5ea.tar.gz
 /2.0.30.tar.gz
 /uwsgi-docs-f728a25.tar.gz
+/uwsgi-docs-5784c30.tar.gz
+/2.0.31.tar.gz
diff --git a/sources b/sources
index 3f730d8..6394bca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (2.0.30.tar.gz) = a8ff667e55956285427d440cf40c552ad6628c192e3b4d0a3d8d5f96aec09c18466feb64f4b305d84194a7d5e2bb15a49a1d6b807af538e474e72867ceb7f644
-SHA512 (uwsgi-docs-f728a25.tar.gz) = d9c43572ea325fc841b929d82f24fd2ec6e798899b7f0d2a74936ad51967f71c09d759f1a2cfb7708a2f9828ac46d06c50c81c9a72828c160231fa281f317415
+SHA512 (uwsgi-docs-5784c30.tar.gz) = 4f966da4a867e45043a0eb4a123b439c8ab1f7ce6e8b32d770545ff7fae586e4e7dd011106aa6ed0ec82a6c6192937e0fd12ed681443332205566fc329e11cd8
+SHA512 (2.0.31.tar.gz) = d4d327f36455438e165298cb5a7d483c951f4acd3d834b46ceeda105bd3664792ead226b02e06db62e92c210544778119bf75a55d9d4f30f8fba896c7de51e6d
diff --git a/uwsgi.spec b/uwsgi.spec
index 790480e..424e718 100644
--- a/uwsgi.spec
+++ b/uwsgi.spec
@@ -1,5 +1,5 @@
 # Documentation sources:
-%global commit f728a2505313a928413af07720db7b261e8adcd4
+%global commit 5784c30866a94942a5200db4d5f6c2850afb1caa
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global docrepo uwsgi-docs
 
@@ -148,7 +148,7 @@
 %if %{with python3_alternate1}
 %global python3_alternate1_pkgname python3.11
 %global __python3_alternate1 python3.11
-%global python3_alternate1_sitelib %(RPM_BUILD_ROOT= %{__python3_alternate1} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")}
+%global python3_alternate1_sitelib %(RPM_BUILD_ROOT= %{__python3_alternate1} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")
 %global python3_alternate1_version 3.11
 %global python3_alternate1_version_nodots 311
 %endif
@@ -156,7 +156,7 @@
 %if %{with python3_alternate2}
 %global python3_alternate2_pkgname python3.12
 %global __python3_alternate2 python3.12
-%global python3_alternate2_sitelib %(RPM_BUILD_ROOT= %{__python3_alternate2} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")}
+%global python3_alternate2_sitelib %(RPM_BUILD_ROOT= %{__python3_alternate2} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")
 %global python3_alternate2_version 3.12
 %global python3_alternate2_version_nodots 312
 %endif
@@ -164,7 +164,7 @@
 %if %{with python3_alternate3}
 %global python3_alternate3_pkgname python3.13
 %global __python3_alternate3 python3.13
-%global python3_alternate3_sitelib %(RPM_BUILD_ROOT= %{__python3_alternate3} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")}
+%global python3_alternate3_sitelib %(RPM_BUILD_ROOT= %{__python3_alternate3} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")
 %global python3_alternate3_version 3.13
 %global python3_alternate3_version_nodots 313
 %endif
@@ -261,8 +261,8 @@
 %endif
 
 Name:           uwsgi
-Version:        2.0.30
-Release:        7%{?dist}
+Version:        2.0.31
+Release:        5%{?dist}
 Summary:        Fast, self-healing, application container server
 # uwsgi is licensed under GPLv2 with a linking exception
 # docs are licensed under MIT
@@ -293,7 +293,6 @@ Patch6:         uwsgi_v8-314_compatibility.patch
 Patch7:         uwsgi_fix_mono.patch
 Patch13:        uwsgi_fix_chroot_chdir.patch
 Patch14:        uwsgi_python312-2.patch
-Patch15:        uwsgi_gcc15-signal-handler.patch
 
 BuildRequires:  curl, libxml2-devel, libuuid-devel, jansson-devel
 BuildRequires:  libyaml-devel, ruby-devel
@@ -1385,7 +1384,6 @@ cp -p %{SOURCE5} README.Fedora
 %endif
 %patch -P13 -p1
 %patch -P14 -p1
-%patch -P15 -p1
 
 %build
 CFLAGS="%{optflags} -Wno-error -Wno-unused-but-set-variable -fPIC" %{__python} uwsgiconfig.py --verbose --build fedora.ini
@@ -2032,6 +2030,21 @@ install -m0644 -D %{SOURCE8} %{buildroot}%{_sysusersdir}/uwsgi.conf
 
 
 %changelog
+* Sun Jan 11 2026 Ralf Ertzinger <ralf@skytale.net> - 2.0.31-5
+- Rebuild for new gccgo libraries
+
+* Thu Jan 08 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.31-4
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0
+
+* Wed Nov 26 2025 Ralf Ertzinger <ralf@skytale.net> - 2.0.31-3
+- Fix path errors for EPEL9 uwsgidecorator packages
+
+* Wed Oct 15 2025 Remi Collet <remi@remirepo.net> - 2.0.31-2
+- rebuild for https://fedoraproject.org/wiki/Changes/php85
+
+* Sun Oct 12 2025 Ralf Ertzinger <ralf@skytale.net> - 2.0.31-1
+- Update to 2.0.31, drop merged patches
+
 * Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 2.0.30-7
 - Rebuilt for Python 3.14.0rc3 bytecode