diff --git a/config/software/ruby.rb b/config/software/ruby.rb
index 389a76fa9..e148b313e 100644
--- a/config/software/ruby.rb
+++ b/config/software/ruby.rb
@@ -119,6 +119,8 @@
   end
   env["CPPFLAGS"] = env["CFLAGS"]
   env["CXXFLAGS"] = env["CFLAGS"]
+  # https://github.com/ruby/ruby/compare/v3_1_4...v3_1_6#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R956
+  env["INCFLAGS"] = env["CFLAGS"]
 else
   # including linux
   env["CFLAGS"] << " -O3 -g -pipe"
@@ -385,9 +387,9 @@
     if windows?
       puts "Finding all the rubies installed and checking their fips_mode status"
       find_command = %{
-        Get-ChildItem c:/opscode -name 'ruby.*' -recurse
+        Get-ChildItem c:/opscode -include 'ruby.*' -recurse
 
-        Get-ChildItem c:/opscode -name 'ruby.exe' -recurse | ForEach-Object {
+        Get-ChildItem c:/opscode -include 'ruby.exe' -recurse | ForEach-Object {
           & $_ -e "require 'openssl'; puts OpenSSL::OPENSSL_VERSION_NUMBER.to_s(16); puts OpenSSL::OPENSSL_LIBRARY_VERSION; OpenSSL.fips_mode = 1; puts 'FIPS mode successfully activated for Ruby' + RUBY_VERSION"
         }
         Write-Output "done looking at rubies"