diff --git a/CHANGELOG b/CHANGELOG
index 9c75db3d..093e89b7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Deprecate the -r/--recipe switch in favor of -f/--file (for more make/rake-like semantics) [Jamis Buck]
+
 * Fix gemspec to include a dependency on rake 0.7 [Jamis Buck]
 
 * Added respect for ENV["HOSTS"] that'll be used instead of the roles specified in the task definition [DHH]. Example:
diff --git a/lib/capistrano/cli.rb b/lib/capistrano/cli.rb
index 0d86e53e..2a84a35c 100644
--- a/lib/capistrano/cli.rb
+++ b/lib/capistrano/cli.rb
@@ -110,6 +110,11 @@ module Capistrano
           "be specified, and are loaded in the given order."
         ) { |value| @options[:actions] << value }
 
+        opts.on("-f", "--file FILE",
+          "A recipe file to load. Multiple recipes may",
+          "be specified, and are loaded in the given order."
+        ) { |value| @options[:recipes] << value }
+
         opts.on("-p", "--password [PASSWORD]",
           "The password to use when connecting. If the switch",
           "is given without a password, the password will be",
@@ -119,8 +124,12 @@ module Capistrano
 
         opts.on("-r", "--recipe RECIPE",
           "A recipe file to load. Multiple recipes may",
-          "be specified, and are loaded in the given order."
-        ) { |value| @options[:recipes] << value }
+          "be specified, and are loaded in the given order.",
+          "(This option is deprecated--please use -f instead)"
+        ) do |value|
+          warn "Deprecated -r/--recipe flag used. Please use -f instead"
+          @options[:recipes] << value
+        end
 
         opts.on("-s", "--set NAME=VALUE",
           "Specify a variable and it's value to set. This",