diff --git a/CHANGELOG b/CHANGELOG
index 17eb5f08..44812274 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Use the --password switch for subversion by default, but add :scm_prefer_prompt variable (defaults to false) [Jamis Buck]
+
+
 *2.0.100 (2.1 Preview 1)* September 1, 2007
 
 * capify-generated Capfile will autoload all recipes from vendor/plugins/*/recipes/*.rb [Graeme Mathieson]
diff --git a/lib/capistrano/recipes/deploy/scm/subversion.rb b/lib/capistrano/recipes/deploy/scm/subversion.rb
index 405e484e..8b1d69db 100644
--- a/lib/capistrano/recipes/deploy/scm/subversion.rb
+++ b/lib/capistrano/recipes/deploy/scm/subversion.rb
@@ -81,7 +81,7 @@ module Capistrano
 
         private
 
-          # If a username is configured for the SCM, return the =command-line
+          # If a username is configured for the SCM, return the command-line
           # switches for that. Note that we don't need to return the password
           # switch, since Capistrano will check for that prompt in the output
           # and will respond appropriately.
@@ -89,6 +89,7 @@ module Capistrano
             username = variable(:scm_username)
             return "" unless username
             result = "--username #{variable(:scm_username)} "
+            result << "--password #{variable(:scm_password)} " unless variable(:scm_prefer_prompt)
             result << "--no-auth-cache " unless variable(:scm_auth_cache)
             result
           end