diff --git a/packages/ri-msys/Rakefile b/packages/ri-msys/Rakefile
index 49d52e9b..68f4ddda 100644
--- a/packages/ri-msys/Rakefile
+++ b/packages/ri-msys/Rakefile
@@ -12,7 +12,7 @@ class RubyPackage < RubyInstaller::Build::Openstruct
     self.rubyver, self.pkgrel = packagever.split("-", 2)
     self.packagename = "rubyinstaller-devkit"
     self.rubyver2 = packagever=='head' ? "4.1" : rubyver[ /^\d+\.\d+/ ]
-    self.rubylibver = packagever=='head' ? "#{rubyver2}.0+4" : "#{rubyver2}.0"
+    self.rubylibver = packagever=='head' ? "#{rubyver2}.0+5" : "#{rubyver2}.0"
 
     case arch
     when 'x64-ucrt'
diff --git a/packages/ri/Rakefile b/packages/ri/Rakefile
index d6e5029b..88feff55 100644
--- a/packages/ri/Rakefile
+++ b/packages/ri/Rakefile
@@ -12,7 +12,7 @@ class RubyPackage < RubyInstaller::Build::Openstruct
     self.rubyver, self.pkgrel = packagever.split("-", 2)
     self.packagename = "rubyinstaller"
     self.rubyver2 = packagever=='head' ? "4.1" : rubyver[ /^\d+\.\d+/ ]
-    self.rubylibver = packagever=='head' ? "#{rubyver2}.0+4" : "#{rubyver2}.0"
+    self.rubylibver = packagever=='head' ? "#{rubyver2}.0+5" : "#{rubyver2}.0"
 
     case arch
     when 'x64-ucrt'
diff --git a/recipes/sandbox/50-gather-sandbox-files.rake b/recipes/sandbox/50-gather-sandbox-files.rake
index 3eb024ba..2649a98b 100644
--- a/recipes/sandbox/50-gather-sandbox-files.rake
+++ b/recipes/sandbox/50-gather-sandbox-files.rake
@@ -1,6 +1,6 @@
 self.sandboxfile_listfile = "#{thisdir}/rubyinstaller-#{package.rubyver}.files"
 self.sandboxfile_arch_listfile = "#{thisdir}/rubyinstaller-#{package.rubyver}-#{package.arch}.files"
 sandboxfiles_rel = File.readlines(ovl_expand_file(sandboxfile_listfile)) + File.readlines(ovl_expand_file(sandboxfile_arch_listfile))
-sandboxfiles_rel = sandboxfiles_rel.map{|path| path.chomp }
+sandboxfiles_rel = sandboxfiles_rel.map{|path| path.chomp.gsub("%{rubylibver}", package.rubylibver) }
 sandboxfiles_rel += import_files.values
 self.sandboxfiles += sandboxfiles_rel.map{|path| File.join(sandboxdir, path)}
diff --git a/recipes/sandbox/rubyinstaller-head.files b/recipes/sandbox/rubyinstaller-head.files
index a66c1a89..d491ab3c 100644
--- a/recipes/sandbox/rubyinstaller-head.files
+++ b/recipes/sandbox/rubyinstaller-head.files
@@ -29,11 +29,11 @@ bin/libyaml-0-2.dll
 bin/ruby.exe
 bin/rubyw.exe
 bin/zlib1.dll
-include/ruby-4.1.0+4
+include/ruby-%{rubylibver}
 lib/pkgconfig/ruby-4.1.pc
-lib/ruby/4.1.0+4
-lib/ruby/gems/4.1.0+4
-lib/ruby/site_ruby/4.1.0+4
-lib/ruby/vendor_ruby/4.1.0+4
+lib/ruby/%{rubylibver}
+lib/ruby/gems/%{rubylibver}
+lib/ruby/site_ruby/%{rubylibver}
+lib/ruby/vendor_ruby/%{rubylibver}
 share/doc/ruby/html/
 share/ri/