diff --git a/rspec-related-create-full-tarball.sh b/rspec-related-create-full-tarball.sh
index a847c6c..c0ba6bf 100644
--- a/rspec-related-create-full-tarball.sh
+++ b/rspec-related-create-full-tarball.sh
@@ -14,10 +14,9 @@ CURRDIR=$(pwd)
 TMPDIRPATH=$(mktemp -d /var/tmp/rspec-tar-XXXXXX)
 pushd $TMPDIRPATH
 
-git clone https://github.com/rspec/$1.git
-pushd $1
-git reset --hard v$2
-popd
+git clone https://github.com/rspec/rspec.git
+pushd rspec
+git reset --hard $1-v$2
 
 ln -sf $1 $1-$2
 tar czf ${CURRDIR}/rubygem-$1-$2-full.tar.gz $1-$2/./
diff --git a/rubygem-rspec-support-3.13.3-diff_spec-format-revert.patch b/rubygem-rspec-support-3.13.3-diff_spec-format-revert.patch
new file mode 100644
index 0000000..31260cf
--- /dev/null
+++ b/rubygem-rspec-support-3.13.3-diff_spec-format-revert.patch
@@ -0,0 +1,20 @@
+--- rspec-support-3.13.3/spec/rspec/support/differ_spec.rb.orig	2025-05-15 11:05:59.000000000 +0900
++++ rspec-support-3.13.3/spec/rspec/support/differ_spec.rb	2025-05-15 11:36:03.054513436 +0900
+@@ -200,7 +200,7 @@ module RSpec
+ 
+           expected_diff = dedent(<<-"EOD")
+             |
+-            |@@ #{one_line_header(5)} @@
++            |@@ -1,5 +1,5 @@
+             | <Animal
+             |   name=bob,
+             |-  species=tortoise
+@@ -427,7 +427,7 @@ module RSpec
+ 
+           expected_diff = dedent(<<-"EOD")
+             |
+-            |@@ #{one_line_header(3)} @@
++            |@@ -1,3 +1,3 @@
+             | this is:
+             |-  another string
+             |+  one string
diff --git a/rubygem-rspec-support.spec b/rubygem-rspec-support.spec
index 5ba8f2e..f41bd15 100644
--- a/rubygem-rspec-support.spec
+++ b/rubygem-rspec-support.spec
@@ -1,9 +1,9 @@
 %global	gem_name	rspec-support
 
-%global	mainver	3.12.0
+%global	mainver	3.13.6
 %undefine	prever
 
-%global	mainrel	3
+%global	baserelease	1
 %global	prerpmver	%(echo "%{?prever}" | sed -e 's|\\.||g')
 
 %bcond_with bootstrap
@@ -12,20 +12,19 @@
 
 Name:		rubygem-%{gem_name}
 Version:	%{mainver}
-Release:	%{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1
+Release:	%{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}}%{?dist}
 
 Summary:	Common functionality to Rspec series
+# SPDX confirmed
 License:	MIT
-URL:		https://github.com/rspec/rspec-support
+URL:		https://rspec.info
 Source0:	https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem
 # %%{SOURCE2} %%{name} %%{version}
 Source1:	rubygem-%{gem_name}-%{version}-full.tar.gz
 Source2:	rspec-related-create-full-tarball.sh
-# https://github.com/rspec/rspec-support/pull/556
-# ruby 3.2.0 / 3.1.3 changes fiber deadlock treatment
-# Tweaked to make test suite flexible
-Patch0:	rubygem-rspec-support-3.12.0-pend-lock-fiber-test.patch
-# tweak regex for search path
+# Workaround tests wrt diff/lcs diff format
+# Partially revert 3.13.2 -> 3.13.3 change
+Patch0:	rubygem-rspec-support-3.13.3-diff_spec-format-revert.patch
 Patch100:	rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch
 
 #BuildRequires:	ruby(release)
@@ -62,8 +61,8 @@ Documentation for %{name}
 %setup -q -T -n %{gem_name}-%{version} -b 1
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
-%patch0 -p1
-%patch100 -p1
+%patch -P0 -p1
+%patch -P100 -p1
 
 %build
 gem build %{gem_name}.gemspec
@@ -111,6 +110,51 @@ rspec spec/ || rspec --tag ~broken
 %doc	%{gem_docdir}
 
 %changelog
+* Wed Sep 17 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.6-1
+- 3.13.6
+
+* Tue Aug 19 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.5-1
+- 3.13.5
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu May 29 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.4-1
+- 3.13.4
+
+* Thu May 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.3-1
+- 3.13.3
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sun Dec 29 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.2-2
+- Backport upstream fix to support ruby34 Hash inspect syntax
+
+* Thu Dec 05 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.2-1
+- 3.13.2
+
+* Wed Nov 06 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.1-3
+- Backport upstream fix for ruby34
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sun Feb 25 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.1-1
+- 3.13.1
+
+* Fri Feb 09 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.0-1
+- 3.13.0
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jul  1 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.1-1
+- 3.12.1
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index b012cd4..3852c20 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rspec-support-3.12.0.gem) = 89d18f75d83805b48375f663bba20ad5994fa0ab97a6aabfc007881ccc681d182035af8c46a9da8b3ee3ff2d9516e7836180c65eb3a7a8eea68eb5a11a881dc1
-SHA512 (rubygem-rspec-support-3.12.0-full.tar.gz) = d6621afbdcb7bbbf9fc0a2a93a25c76830676deedf81fc0152683b9e8ca452afb007072e37215c3f8769a5250bb2463c7bb5f3177cdc3cdc935d5e967bbf4bf3
+SHA512 (rubygem-rspec-support-3.13.6-full.tar.gz) = 09387dd39649d47bc3b859251e428808e06b1d2e6bc13d38f2b2da9241e1c937c71992f4b042053729d64af535fd6a6931d73b6d4f454c35eceae037839fa77d
+SHA512 (rspec-support-3.13.6.gem) = 7a07e6233e59da5bf9b1347de3e56330b02906cec8d05d619b1ff5f802f98cdf1194e63c01f4a3f5ac0bc68b59794edeaf4dc91cab37b563d57be82543e7df12