diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a2104f1..4b1fb51b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ default of Capistrano 3.4.0 and earlier.
 
 Other changes:
 
+* Capistrano is now fully-compatible with Rake 11.0. (@mattbrictson)
 * Internal Rubocop cleanups.
 * `remove` DSL method for removing values like from arrays like `linked_dirs`
 * `append` DSL method for pushing values like `linked_dirs`
diff --git a/lib/capistrano/application.rb b/lib/capistrano/application.rb
index 37ded441..020fbd02 100644
--- a/lib/capistrano/application.rb
+++ b/lib/capistrano/application.rb
@@ -105,7 +105,7 @@ module Capistrano
       ["--version", "-V",
        "Display the program version.",
        lambda { |_value|
-         puts "Capistrano Version: #{Capistrano::VERSION} (Rake Version: #{RAKEVERSION})"
+         puts "Capistrano Version: #{Capistrano::VERSION} (Rake Version: #{Rake::VERSION})"
          exit
        }
       ]
diff --git a/spec/lib/capistrano/application_spec.rb b/spec/lib/capistrano/application_spec.rb
index 0bdf5968..95f73f7b 100644
--- a/spec/lib/capistrano/application_spec.rb
+++ b/spec/lib/capistrano/application_spec.rb
@@ -29,7 +29,7 @@ describe Capistrano::Application do
     expect(out).to match(/\bCapistrano Version\b/)
     expect(out).to match(/\b#{Capistrano::VERSION}\b/)
     expect(out).to match(/\bRake Version\b/)
-    expect(out).to match(/\b#{RAKEVERSION}\b/)
+    expect(out).to match(/\b#{Rake::VERSION}\b/)
   end
 
   it "overrides the rake method, and sets the sshkit_backend to SSHKit::Backend::Printer" do