diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch
index 36708f0..fdf0dfe 100644
--- a/ruby-2.1.0-custom-rubygems-location.patch
+++ b/ruby-2.1.0-custom-rubygems-location.patch
@@ -67,7 +67,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
 index e9110a17ca..76a1f0a315 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
-@@ -355,6 +355,7 @@ def CONFIG.[](name, mandatory = false)
+@@ -359,6 +359,7 @@ def CONFIG.[](name, mandatory = false)
    vendorlibdir = CONFIG["vendorlibdir"]
    vendorarchlibdir = CONFIG["vendorarchdir"]
  end
@@ -75,7 +75,7 @@ index e9110a17ca..76a1f0a315 100755
  mandir = CONFIG["mandir", true]
  docdir = CONFIG["docdir", true]
  enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
-@@ -586,7 +587,16 @@ def stub
+@@ -590,7 +591,16 @@ def stub
  install?(:local, :comm, :lib) do
    prepare "library scripts", rubylibdir
    noinst = %w[*.txt *.rdoc *.gemspec]
diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch
index a594ed9..1f42472 100644
--- a/ruby-2.3.0-ruby_version.patch
+++ b/ruby-2.3.0-ruby_version.patch
@@ -171,7 +171,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
 index d4c110e..d39c9a6 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
-@@ -444,7 +444,7 @@ def CONFIG.[](name, mandatory = false)
+@@ -448,7 +448,7 @@ def CONFIG.[](name, mandatory = false)
  
  install?(:doc, :rdoc) do
    if $rdocdir
@@ -230,7 +230,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
 index b25068405d..e9fef4a311 100644
 --- a/test/rubygems/test_gem.rb
 +++ b/test/rubygems/test_gem.rb
-@@ -1445,7 +1445,8 @@ def test_self_use_paths
+@@ -1410,7 +1410,8 @@ def test_self_use_paths
  
    def test_self_user_dir
      parts = [@userhome, '.gem', Gem.ruby_engine]
@@ -240,7 +240,7 @@ index b25068405d..e9fef4a311 100644
  
      FileUtils.mkdir_p File.join(parts)
  
-@@ -1521,7 +1522,7 @@ def test_self_vendor_dir
+@@ -1486,7 +1487,7 @@ def test_self_vendor_dir
      vendordir(File.join(@tempdir, 'vendor')) do
        expected =
          File.join RbConfig::CONFIG['vendordir'], 'gems',
diff --git a/ruby.spec b/ruby.spec
index 4665ca5..8e4adb6 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -10,7 +10,7 @@
 #%%global milestone rc1
 
 # Keep the revision enabled for pre-releases from GIT.
-%global revision fdf3996349
+%global revision 40a1af6151
 
 %global ruby_archive %{name}-%{ruby_version}
 
@@ -30,11 +30,11 @@
 %global rubygems_dir %{_datadir}/rubygems
 
 # Bundled libraries versions
-%global rubygems_version 3.3.0
+%global rubygems_version 3.3.1
 %global rubygems_molinillo_version 0.7.0
 
 # Default gems.
-%global bundler_version 2.3.0
+%global bundler_version 2.3.1
 %global bundler_connection_pool_version 2.3.0
 %global bundler_fileutils_version 1.4.1
 %global bundler_molinillo_version 0.7.0
@@ -72,7 +72,7 @@
 # Binary extension in RBS 1.7.1 fails to build.
 # https://bugs.ruby-lang.org/issues/18373
 %global rbs_version 1.8.1
-%global typeprof_version 0.21.0
+%global typeprof_version 0.21.1
 %global debug_version 1.4.0
 
 %global tapset_libdir %(echo %{_libdir} | sed 's/64//')*
@@ -155,9 +155,6 @@ Patch19: ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
 # Fix `TestPumaControlCli#test_control_ssl` testcase in Puma.
 # https://github.com/ruby/openssl/pull/399#issuecomment-966239736
 Patch20: ruby-3.1.0-SSL_read-EOF-handling.patch
-# Fix several RubyGems test failures due to OpenSSL 3.x.
-# https://github.com/rubygems/rubygems/pull/5196
-Patch21: rubygems-3.3.1-Fix-compatibility-with-OpenSSL-3.0.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Suggests: rubypick
@@ -616,7 +613,6 @@ rm -rf ext/fiddle/libffi*
 %patch6 -p1
 %patch19 -p1
 %patch20 -p1
-%patch21 -p1
 
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@@ -1191,7 +1187,7 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/TestReadline#test_interrupt_in_other_thread/"
 %{gem_dir}/specifications/default/drb-2.1.0.gemspec
 %{gem_dir}/specifications/default/english-0.7.1.gemspec
 %{gem_dir}/specifications/default/erb-%{erb_version}.gemspec
-%{gem_dir}/specifications/default/error_highlight-0.2.0.gemspec
+%{gem_dir}/specifications/default/error_highlight-0.3.0.gemspec
 %{gem_dir}/specifications/default/etc-1.3.0.gemspec
 %{gem_dir}/specifications/default/fcntl-1.0.1.gemspec
 %{gem_dir}/specifications/default/fiddle-1.1.0.gemspec
@@ -1459,7 +1455,7 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/TestReadline#test_interrupt_in_other_thread/"
 
 %changelog
 * Wed Dec 01 2021 Vít Ondruch <vondruch@redhat.com> - 3.1.0-1
-- Upgrade to Ruby 3.1.0 (fdf3996349).
+- Upgrade to Ruby 3.1.0 (40a1af6151).
 
 * Thu Nov 25 2021 Vít Ondruch <vondruch@redhat.com> - 3.0.2-154
 - Upgrade to Ruby 3.0.3.
diff --git a/rubygems-3.3.1-Fix-compatibility-with-OpenSSL-3.0.patch b/rubygems-3.3.1-Fix-compatibility-with-OpenSSL-3.0.patch
deleted file mode 100644
index f2763fe..0000000
--- a/rubygems-3.3.1-Fix-compatibility-with-OpenSSL-3.0.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 558128594de16add5b453833fd5b043a24c1b7f5 Mon Sep 17 00:00:00 2001
-From: Kazuki Yamaguchi <k@rhe.jp>
-Date: Wed, 22 Dec 2021 01:38:47 +0900
-Subject: [PATCH 1/3] Use OpenSSL::PKey::EC.generate to generate ECC key pairs
-
-When Ruby/OpenSSL is built against OpenSSL 3.0, OpenSSL::PKey::PKey
-instances are immutable and OpenSSL::PKey::EC#generate_key cannot work
-because it modifies the receiver.
-
-OpenSSL::PKey::EC.generate is available on Ruby 2.4 (Ruby/OpenSSL 2.0)
-or later.
----
- lib/rubygems/security.rb | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb
-index 22759972070..2aa07381d69 100644
---- a/lib/rubygems/security.rb
-+++ b/lib/rubygems/security.rb
-@@ -490,9 +490,13 @@ def self.create_key(algorithm)
-       when 'rsa'
-         OpenSSL::PKey::RSA.new(RSA_DSA_KEY_LENGTH)
-       when 'ec'
--        domain_key = OpenSSL::PKey::EC.new(EC_NAME)
--        domain_key.generate_key
--        domain_key
-+        if RUBY_VERSION >= "2.4.0"
-+          OpenSSL::PKey::EC.generate(EC_NAME)
-+        else
-+          domain_key = OpenSSL::PKey::EC.new(EC_NAME)
-+          domain_key.generate_key
-+          domain_key
-+        end
-       else
-         raise Gem::Security::Exception,
-         "#{algorithm} algorithm not found. RSA, DSA, and EC algorithms are supported."
-
-From 60067d4f09b7fb9c23bed38e91acfde0293f29a0 Mon Sep 17 00:00:00 2001
-From: Kazuki Yamaguchi <k@rhe.jp>
-Date: Wed, 22 Dec 2021 01:49:05 +0900
-Subject: [PATCH 2/3] Use OpenSSL::X509::Certificate#check_private_key
-
-The method is for the exact purpose: to check that an instance of
-OpenSSL::PKey::PKey matches the public key in a certificate.
----
- lib/rubygems/security.rb        | 2 +-
- lib/rubygems/security/policy.rb | 4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb
-index 2aa07381d69..2906819bd34 100644
---- a/lib/rubygems/security.rb
-+++ b/lib/rubygems/security.rb
-@@ -531,7 +531,7 @@ def self.re_sign(expired_certificate, private_key, age = ONE_YEAR,
-     raise Gem::Security::Exception,
-           "incorrect signing key for re-signing " +
-           "#{expired_certificate.subject}" unless
--      expired_certificate.public_key.to_pem == get_public_key(private_key).to_pem
-+      expired_certificate.check_private_key(private_key)
- 
-     unless expired_certificate.subject.to_s ==
-            expired_certificate.issuer.to_s
-diff --git a/lib/rubygems/security/policy.rb b/lib/rubygems/security/policy.rb
-index 3c3cb647ee3..06eae073f4a 100644
---- a/lib/rubygems/security/policy.rb
-+++ b/lib/rubygems/security/policy.rb
-@@ -115,11 +115,9 @@ def check_key(signer, key)
-       raise Gem::Security::Exception, 'missing key or signature'
-     end
- 
--    public_key = Gem::Security.get_public_key(key)
--
-     raise Gem::Security::Exception,
-       "certificate #{signer.subject} does not match the signing key" unless
--        signer.public_key.to_pem == public_key.to_pem
-+        signer.check_private_key(key)
- 
-     true
-   end
-
-From 6819e3d0fadc10ce8d10919402eedb730cf0e43f Mon Sep 17 00:00:00 2001
-From: Kazuki Yamaguchi <k@rhe.jp>
-Date: Wed, 22 Dec 2021 01:54:10 +0900
-Subject: [PATCH 3/3] Fix Gem::Security.get_public_key on OpenSSL 3.0
-
-Ruby/OpenSSL 2.2 added OpenSSL::PKey::PKey#public_to_der for serializing
-only the public key components contained in the instance. This works
-for all possible key types.
----
- lib/rubygems/security.rb | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb
-index 2906819bd34..f21c1756422 100644
---- a/lib/rubygems/security.rb
-+++ b/lib/rubygems/security.rb
-@@ -424,6 +424,8 @@ def self.create_cert(subject, key, age = ONE_YEAR, extensions = EXTENSIONS,
-   # Gets the right public key from a PKey instance
- 
-   def self.get_public_key(key)
-+    # Ruby 3.0 (Ruby/OpenSSL 2.2) or later
-+    return OpenSSL::PKey.read(key.public_to_der) if key.respond_to?(:public_to_der)
-     return key.public_key unless key.is_a?(OpenSSL::PKey::EC)
- 
-     ec_key = OpenSSL::PKey::EC.new(key.group.curve_name)
diff --git a/sources b/sources
index 2b40f22..44e8e25 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ruby-3.0.3.tar.xz) = bb9ea426278d5a7ac46595296f03b82d43df8b7db41045cdf85611e05e26c703c53f700494cd7cf5d4c27fa953bdc5c144317d7720812db0a6e3b6f4bc4d2e00
+SHA512 (ruby-3.1.0-40a1af6151.tar.xz) = 855c415c06f4e7a2933c2d7027660a275487f3f325ffa8d96e1ca5fb4bc86a804b278b3ffabc7820a3125bf5c26da48372843509f2b05ba5dc716ec57821040d