diff --git a/CHANGELOG b/CHANGELOG
index bd7f17c1..ec7b7daa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Auto-require the SSH shell service, to avoid race conditions [Jamis Buck]
+
 * Add a millisecond sleep in upload to reduce CPU impact [Jamis Buck]
 
 * Allow the logger to be set via Configuration#logger= [Jamis Buck]
diff --git a/lib/capistrano/configuration/actions/file_transfer.rb b/lib/capistrano/configuration/actions/file_transfer.rb
index 01815596..710cfeac 100644
--- a/lib/capistrano/configuration/actions/file_transfer.rb
+++ b/lib/capistrano/configuration/actions/file_transfer.rb
@@ -16,9 +16,7 @@ module Capistrano
         end
     
         # Get file remote_path from FIRST server targetted by
-        # the current task and transfer it to local machine as path. It will use
-        # SFTP if Net::SFTP is installed; otherwise it will fall back to using
-        # 'cat', which may cause corruption in binary files.
+        # the current task and transfer it to local machine as path.
         #
         # get "#{deploy_to}/current/log/production.log", "log/production.log.web"
         def get(remote_path, path, options = {})
diff --git a/lib/capistrano/ssh.rb b/lib/capistrano/ssh.rb
index 643ec915..6cbf66da 100644
--- a/lib/capistrano/ssh.rb
+++ b/lib/capistrano/ssh.rb
@@ -19,6 +19,7 @@ module Capistrano
     service/agentforward/services service/agentforward/driver
     service/process/driver util/prompter
     service/forward/services service/forward/driver service/forward/local-network-handler service/forward/remote-network-handler
+    service/shell/services service/shell/driver
     lenient-host-key-verifier
     transport/compress/services transport/compress/zlib-compressor transport/compress/none-compressor transport/compress/zlib-decompressor transport/compress/none-decompressor
     transport/kex/services transport/kex/dh transport/kex/dh-gex