diff --git a/dev-ruby/xpath/metadata.xml b/dev-ruby/xpath/metadata.xml
index 9681cadb8c350..b3826aa3c3016 100644
--- a/dev-ruby/xpath/metadata.xml
+++ b/dev-ruby/xpath/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">jnicklas/xpath</remote-id>
+    <remote-id type="github">teamcapybara/xpath</remote-id>
+    <remote-id type="rubygems">xpath</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/xpath/xpath-3.2.0-r1.ebuild b/dev-ruby/xpath/xpath-3.2.0-r1.ebuild
index b1bc0903ead40..93dc28a3b062c 100644
--- a/dev-ruby/xpath/xpath-3.2.0-r1.ebuild
+++ b/dev-ruby/xpath/xpath-3.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 inherit ruby-fakegem
 
 DESCRIPTION="XPath is a Ruby DSL around a subset of XPath 1.0"
-HOMEPAGE="https://github.com/jnicklas/xpath"
+HOMEPAGE="https://github.com/teamcapybara/xpath"
 LICENSE="MIT"
 
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"