diff --git a/rubygem-yard.spec b/rubygem-yard.spec
index d040f93..01473b6 100644
--- a/rubygem-yard.spec
+++ b/rubygem-yard.spec
@@ -1,8 +1,8 @@
 %global	gem_name	yard
 
 Name:		rubygem-%{gem_name}
-Version:	0.9.36
-Release:	1%{?dist}
+Version:	0.9.38
+Release:	2%{?dist}
 
 Summary:	Documentation tool for consistent and usable documentation in Ruby
 
@@ -20,6 +20,9 @@ Source0:	https://rubygems.org/gems/%{gem_name}-%{version}.gem
 Source1:	%{gem_name}-%{version}-test-missing-files.tar.gz
 # Source1 is created by $ bash %%SOURCE2 %%version
 Source2:	yard-create-missing-test-files.sh
+# https://github.com/lsegal/yard/issues/1637
+# Fix spec testsuite with namespace collision
+Patch0:	yard-0.9.38-issue1637-spec-namespace-collision.patch
 
 # The 'irb/notifier' might be required for parsing of some old Ruby code.
 # https://github.com/lsegal/yard/blob/v0.9.24/lib/yard/parser/ruby/legacy/irb/slex.rb#L13
@@ -33,6 +36,7 @@ BuildRequires:	rubygem(asciidoctor)
 BuildRequires:	rubygem(bundler)
 BuildRequires:	rubygem(irb)
 BuildRequires:	rubygem(rack)
+BuildRequires:	/usr/bin/rackup
 BuildRequires:	rubygem(rake)
 BuildRequires:	rubygem(redcarpet)
 BuildRequires:	rubygem(rspec)
@@ -57,6 +61,7 @@ Documentation for %{name}.
 
 %prep
 %setup -q -n %{gem_name}-%{version} -b1
+%patch -P0 -p1
 mv ../%{gem_name}-%{version}.gemspec .
 
 %build
@@ -111,8 +116,29 @@ rspec -r spec_helper spec
 %doc	%{gem_instdir}/docs/
 
 %changelog
+* Fri Jan 02 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.38-2
+- Fix spec testsuite failure with namespace collision
+
+* Mon Dec 08 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.38-1
+- 0.9.38
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.37-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Jun 10 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.37-3
+- BR: /usr/bin/rackup for rack / rackup gem split (bug 2371181)
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.37-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Sep 05 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.37-1
+- 0.9.37
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Fri Mar 01 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.36-1
-- 0.9.36
+- 0.9.36 (Fixes CVE-2024-27285)
 
 * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.34-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources
index c42d692..edc5871 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (yard-0.9.36.gem) = dbf7fd6563f9272a352d99733473186ed8bc42a10200dbbf191446b871be7e02c4ceb2f0db154a2bdb1d58533a4a2d4df76ab867b494b92373772ed8fef292e3
-SHA512 (yard-0.9.36-test-missing-files.tar.gz) = 2db175b1f966e42a11669acb8b93e3ab48f50c14409c071953f4cdc0c8eacdbb234f408eef68a411f541e6c299bfcc6a9d972669028cbf441391376461d6600c
+SHA512 (yard-0.9.38.gem) = af69f50fb7ce065adc8b387c93327ee9001fd2526ddce9381d883c4aa9f1518e895a2128623956210509c2c0528700cab91c4fcb30c0c88802e9007d5c5b43f2
+SHA512 (yard-0.9.38-test-missing-files.tar.gz) = 08084b435ebbccf7fb85707c243d7a6e5be21f09188b05ebe50e41b897e34cb32d2310423567a89aef205ef2db5bfdfa7e334a1f2f61013132112331bce6df08
diff --git a/yard-0.9.38-issue1637-spec-namespace-collision.patch b/yard-0.9.38-issue1637-spec-namespace-collision.patch
new file mode 100644
index 0000000..cbc41de
--- /dev/null
+++ b/yard-0.9.38-issue1637-spec-namespace-collision.patch
@@ -0,0 +1,16 @@
+diff --git a/spec/tags/types_explainer_spec.rb b/spec/tags/types_explainer_spec.rb
+index de7454d3..5eb72d47 100644
+--- a/spec/tags/types_explainer_spec.rb
++++ b/spec/tags/types_explainer_spec.rb
+@@ -5,10 +5,9 @@ RSpec.describe YARD::Tags::TypesExplainer do
+   CollectionType = YARD::Tags::TypesExplainer::CollectionType
+   FixedCollectionType = YARD::Tags::TypesExplainer::FixedCollectionType
+   HashCollectionType = YARD::Tags::TypesExplainer::HashCollectionType
+-  Parser = YARD::Tags::TypesExplainer::Parser
+ 
+   def parse(types)
+-    Parser.new(types).parse
++    YARD::Tags::TypesExplainer::Parser.new(types).parse
+   end
+ 
+   def parse_fail(types)