--- lib/rdoc/ri/paths.rb.orig	2023-05-23 02:13:31.194204108 +0000
+++ lib/rdoc/ri/paths.rb	2023-05-23 02:14:21.614083156 +0000
@@ -10,7 +10,7 @@
   #:stopdoc:
   require 'rbconfig'
 
-  version = RbConfig::CONFIG['ruby_version']
+  version = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
 
   BASE    = File.join RbConfig::CONFIG['ridir'], version
 
--- test/rubygems/test_gem.rb.orig	2023-05-23 02:18:39.133465166 +0000
+++ test/rubygems/test_gem.rb	2023-05-23 03:43:12.012097807 +0000
@@ -1337,7 +1337,8 @@
 
   def test_self_user_dir
     parts = [@userhome, ".gem", Gem.ruby_engine]
-    parts << RbConfig::CONFIG["ruby_version"] unless RbConfig::CONFIG["ruby_version"].empty?
+    ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+    parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
 
     FileUtils.mkdir_p File.join(parts)
 
@@ -1413,7 +1414,7 @@
     vendordir(File.join(@tempdir, "vendor")) do
       expected =
         File.join RbConfig::CONFIG["vendordir"], "gems",
-                  RbConfig::CONFIG["ruby_version"]
+                  RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
 
       assert_equal expected, Gem.vendor_dir
     end
--- tool/rbinstall.rb.orig	2023-05-23 03:31:36.349735657 +0000
+++ tool/rbinstall.rb	2023-05-23 03:33:50.288556921 +0000
@@ -453,7 +453,7 @@
 
 install?(:doc, :rdoc) do
   if $rdocdir
-    ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system")
+    ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version_dir_name'] || CONFIG['ruby_version'], "system")
     prepare "rdoc", ridatadir
     install_recursive($rdocdir, ridatadir, :no_install => rdoc_noinst, :mode => $data_mode)
   end