diff --git a/lib/rake/task_manager.rb b/lib/rake/task_manager.rb
index d503a3044..1991088fa 100644
--- a/lib/rake/task_manager.rb
+++ b/lib/rake/task_manager.rb
@@ -60,7 +60,8 @@ def [](task_name, scopes=nil)
     end
 
     def generate_message_for_undefined_task(task_name)
-      message = "Don't know how to build task '#{task_name}' (See the list of available tasks with `rake --tasks`)"
+      message = "Don't know how to build task '#{task_name}' "\
+                "(See the list of available tasks with `#{Rake.application.name} --tasks`)"
       message + generate_did_you_mean_suggestions(task_name)
     end
 
diff --git a/test/test_rake_task_manager.rb b/test/test_rake_task_manager.rb
index 7d8c40902..88937c604 100644
--- a/test/test_rake_task_manager.rb
+++ b/test/test_rake_task_manager.rb
@@ -28,6 +28,16 @@ def test_index
     assert_equal "Don't know how to build task 'bad' (See the list of available tasks with `rake --tasks`)", e.message
   end
 
+  def test_undefined_task_with_custom_application
+    Rake.application.init("myrake", nil)
+
+    e = assert_raises RuntimeError do
+      @tm["bad"]
+    end
+
+    assert_equal "Don't know how to build task 'bad' (See the list of available tasks with `myrake --tasks`)", e.message
+  end
+
   def test_name_lookup
     t = @tm.define_task(Rake::Task, :t)
     assert_equal t, @tm[:t]