diff --git a/CHANGELOG b/CHANGELOG
index 6efffe19..69f960c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix incorrect reference to the 'setup' task in task documentation [rajeshduggal]
+
 * Don't try to kill the spawner process on deploy:stop if no spawner process exists [Jamis Buck]
 
 * Dynamic roles (e.g. role(:app) { "host.name" }) [dmasover]
diff --git a/lib/capistrano/recipes/deploy.rb b/lib/capistrano/recipes/deploy.rb
index 800e48d2..57c91d99 100644
--- a/lib/capistrano/recipes/deploy.rb
+++ b/lib/capistrano/recipes/deploy.rb
@@ -110,11 +110,11 @@ namespace :deploy do
   desc <<-DESC
     Prepares one or more servers for deployment. Before you can use any \
     of the Capistrano deployment tasks with your project, you will need to \
-    make sure all of your servers have been prepared with `cap setup'. When \
+    make sure all of your servers have been prepared with `cap deploy:setup'. When \
     you add a new server to your cluster, you can easily run the setup task \
     on just that server by specifying the HOSTS environment variable:
 
-      $ cap HOSTS=new.server.com setup
+      $ cap HOSTS=new.server.com deploy:setup
 
     It is safe to run this task on servers that have already been set up; it \
     will not destroy any deployed revisions or data.