diff --git a/.gitignore b/.gitignore
index 4d0230f..4672384 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/xdebug-3.0.4-54c7c25.tar.gz
+SOURCES/xdebug-3.1.2-52911af.tar.gz
diff --git a/.php-pecl-xdebug3.metadata b/.php-pecl-xdebug3.metadata
index 21a5a85..f026b8a 100644
--- a/.php-pecl-xdebug3.metadata
+++ b/.php-pecl-xdebug3.metadata
@@ -1 +1 @@
-0f6d79b469562a27b03905c67e659bba3deb956e SOURCES/xdebug-3.0.4-54c7c25.tar.gz
+0d487e5ba43ac5bcb4f659a54c700e5887012ecc SOURCES/xdebug-3.1.2-52911af.tar.gz
diff --git a/SPECS/php-pecl-xdebug3.spec b/SPECS/php-pecl-xdebug3.spec
index 19ca547..afc643e 100644
--- a/SPECS/php-pecl-xdebug3.spec
+++ b/SPECS/php-pecl-xdebug3.spec
@@ -16,11 +16,11 @@
 
 %global pecl_name  xdebug
 %global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
-%global gh_commit  54c7c2521763ee522809de0c54311443b11343c1
+%global gh_commit  52911afee0d66f4569d71d25bb9532c8fab9d5f5
 %global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
 
 # version/release
-%global upstream_version 3.0.4
+%global upstream_version 3.1.2
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -30,7 +30,7 @@
 Name:           php-pecl-xdebug3
 Summary:        Provides functions for function traces and profiling
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        5%{?dist}
+Release:        1%{?dist}
 Source0:        https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz
 
 # The Xdebug License, version 1.01
@@ -190,6 +190,11 @@ done
 cd NTS
 : Upstream test suite NTS extension
 
+%ifarch %{ix86}
+# see https://bugs.xdebug.org/view.php?id=2048
+rm tests/base/bug02036.phpt
+%endif
+
 # bug00886 is marked as slow as it uses a lot of disk space
 TEST_OPTS="-q -x --show-diff"
 
@@ -217,6 +222,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Fri Dec 10 2021 Remi Collet <rcollet@redhat.com> - 3.1.2-1
+- update to 3.1.2 rhbz#2030322
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.4-5
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688