diff --git a/Rakefile b/Rakefile
index e0d2ced3d..6179be099 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,6 +9,9 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+# XXX: https://github.com/bundler/bundler/pull/4981
+require "bundler/plugin/api/source"
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rdoc/task"
diff --git a/appveyor.yml b/appveyor.yml
index 2710426ad..62378b53a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,15 +4,13 @@ clone_depth: 10
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - ruby --version
-  - gem update --system
   - gem --version
-  - gem install minitest --no-document
+  - gem install minitest bundler --no-document
 build_script:
   - net user
   - net localgroup
 test_script:
   - ruby -Ilib exe/rake
-
 environment:
   matrix:
     - ruby_version: "193"
diff --git a/lib/rake.rb b/lib/rake.rb
index ece6882c6..07b03284b 100644
--- a/lib/rake.rb
+++ b/lib/rake.rb
@@ -32,7 +32,6 @@ module Rake; end
 require "ostruct"
 
 require "rake/ext/string"
-require "rake/ext/fixnum"
 
 require "rake/win32"
 
diff --git a/lib/rake/application.rb b/lib/rake/application.rb
index 464b11374..e94f17290 100644
--- a/lib/rake/application.rb
+++ b/lib/rake/application.rb
@@ -449,7 +449,7 @@ def standard_rake_options # :nodoc:
             "(default is number of CPU cores + 4)",
             lambda { |value|
               if value.nil? || value == ""
-                value = Fixnum::MAX
+                value = Float::INFINITY
               elsif value =~ /^\d+$/
                 value = value.to_i
               else
diff --git a/lib/rake/ext/fixnum.rb b/lib/rake/ext/fixnum.rb
deleted file mode 100644
index 56079ee6d..000000000
--- a/lib/rake/ext/fixnum.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#--
-# Extensions to fixnum to define some constants missing from Ruby itself
-
-class Fixnum
-
-  unless constants.include? :MAX
-
-    # future versions of Ruby may end up defining this constant
-    # in a more portable way, as documented by Matz himself in:
-    #
-    #   https://bugs.ruby-lang.org/issues/7517
-    #
-    # ... but until such time, we define the constant ourselves
-    MAX = (2**(0.size * 8 - 2) - 1) # :nodoc:
-
-  end
-
-end
diff --git a/rake.gemspec b/rake.gemspec
index f5151fd1d..21c3f9cde 100644
--- a/rake.gemspec
+++ b/rake.gemspec
@@ -9,7 +9,17 @@ Gem::Specification.new do |s|
   s.email = ["hsbt@ruby-lang.org".freeze, "drbrain@segment7.net".freeze, "".freeze]
 
   s.summary = "Rake is a Make-like program implemented in Ruby".freeze
-  s.description = "Rake is a Make-like program implemented in Ruby. Tasks and dependencies are\nspecified in standard Ruby syntax.\n\nRake has the following features:\n\n* Rakefiles (rake's version of Makefiles) are completely defined in\n  standard Ruby syntax.  No XML files to edit.  No quirky Makefile\n  syntax to worry about (is that a tab or a space?)\n\n* Users can specify tasks with prerequisites.\n\n* Rake supports rule patterns to synthesize implicit tasks.\n\n* Flexible FileLists that act like arrays but know about manipulating\n  file names and paths.\n\n* Supports parallel execution of tasks.".freeze
+  s.description = <<-DESCRIPTION
+Rake is a Make-like program implemented in Ruby. Tasks and dependencies are
+specified in standard Ruby syntax.
+Rake has the following features:
+  * Rakefiles (rake's version of Makefiles) are completely defined in standard Ruby syntax.
+    No XML files to edit. No quirky Makefile syntax to worry about (is that a tab or a space?)
+  * Users can specify tasks with prerequisites.
+  * Rake supports rule patterns to synthesize implicit tasks.
+  * Flexible FileLists that act like arrays but know about manipulating file names and paths.
+  * Supports parallel execution of tasks.
+  DESCRIPTION
   s.homepage = "https://github.com/ruby/rake".freeze
   s.licenses = ["MIT".freeze]