diff --git a/projects/rubygems.org/fit-n-finish.3.patch b/projects/rubygems.org/fit-n-finish.3.patch
new file mode 100644
index 00000000..b1e076c1
--- /dev/null
+++ b/projects/rubygems.org/fit-n-finish.3.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
+index b186375..de168c4 100644
+--- a/lib/rubygems/defaults.rb
++++ b/lib/rubygems/defaults.rb
+@@ -137,7 +129,7 @@ def self.config_file
+   # The path to standard location of the user's state file.
+
+   def self.state_file
+-    @state_file ||= File.join(Gem.state_home, "gem", "last_update_check").tap(&Gem::UNTAINT)
++    @state_file ||= File.join(Gem.state_home, "last_update_check").tap(&Gem::UNTAINT)
+   end
+
+   ##
diff --git a/projects/rubygems.org/fit-n-finish.patch b/projects/rubygems.org/fit-n-finish.patch
index 7cc82f46..9e3afaa5 100644
--- a/projects/rubygems.org/fit-n-finish.patch
+++ b/projects/rubygems.org/fit-n-finish.patch
@@ -77,15 +77,6 @@ index b186375..de168c4 100644
      end
    end
 
-@@ -137,7 +129,7 @@ def self.config_file
-   # The path to standard location of the user's state file.
-
-   def self.state_file
--    @state_file ||= File.join(Gem.state_home, "gem", "last_update_check").tap(&Gem::UNTAINT)
-+    @state_file ||= File.join(Gem.state_home, "last_update_check").tap(&Gem::UNTAINT)
-   end
-
-   ##
 @@ -151,7 +143,11 @@ def self.cache_home
    # The path to standard location of the user's data directory.
 
diff --git a/projects/rubygems.org/package.yml b/projects/rubygems.org/package.yml
index e31bc59b..6ca61945 100644
--- a/projects/rubygems.org/package.yml
+++ b/projects/rubygems.org/package.yml
@@ -30,6 +30,10 @@ build:
         patch -p1 < "$SRCROOT"/props/fit-n-finish.patch
         patch -p1 < "$SRCROOT"/props/fit-n-finish.2.patch
       working-directory: ${{prefix}}
+    - run: |
+        patch -p1 < "$SRCROOT"/props/fit-n-finish.3.patch
+      working-directory: ${{prefix}}
+      if: '>=3.4'
     - run: |
         sed -i.bak -e 's/Dir\.mkdir dir, \*\[options\[:dir_mode\].*/FileUtils.mkdir_p dir, *[options[:dir_mode] \&\& 0o755].compact/' installer.rb
         rm installer.rb.bak