--- lib/rdoc/ri/paths.rb.orig	2017-06-06 06:16:35 -0500
+++ lib/rdoc/ri/paths.rb	2017-06-06 06:16:59 -0500
@@ -10,7 +10,7 @@
   #:stopdoc:
   require 'rbconfig'
 
-  version = RbConfig::CONFIG['ruby_version']
+  version = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
 
   BASE    = if RbConfig::CONFIG.key? 'ridir' then
               File.join RbConfig::CONFIG['ridir'], version
--- test/rubygems/test_gem.rb.orig	2017-06-06 06:23:11 -0500
+++ test/rubygems/test_gem.rb	2017-06-06 06:24:46 -0500
@@ -1101,7 +1101,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?
 
     assert_equal File.join(parts), Gem.user_dir
   end
--- tool/rbinstall.rb.orig	2019-09-20 07:27:50 +0000
+++ tool/rbinstall.rb	2019-09-20 07:29:15 +0000
@@ -424,7 +424,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
--- ./test/rubygems/test_gem.rb.orig	2020-08-12 11:16:58 +0000
+++ ./test/rubygems/test_gem.rb	2020-08-12 11:17:41 +0000
@@ -1430,7 +1430,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