diff --git a/CHANGELOG b/CHANGELOG
index f65ca005..26964081 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Make user input for yes/no prompts work correctly in the Mercurial module [Matthew Elder]
+
 * Use single quotes to escape semicolon in find command, instead of a backslash [via michael.italia@gmail.com]
 
 * Better quoting of reserved characters in commands [Jamis Buck]
diff --git a/lib/capistrano/recipes/deploy/scm/mercurial.rb b/lib/capistrano/recipes/deploy/scm/mercurial.rb
index b6bc9ecf..f2a062bc 100644
--- a/lib/capistrano/recipes/deploy/scm/mercurial.rb
+++ b/lib/capistrano/recipes/deploy/scm/mercurial.rb
@@ -84,7 +84,7 @@ module Capistrano
                 "Prompt was: #{text}"
             end
           when /yes\/no/i
-            "yes"
+            "yes\n"
           end
         end