diff --git a/CHANGELOG b/CHANGELOG
index fdb7db34..72dd1bd8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Don't run the upgrade:revisions task on non-release servers [Jamis Buck]
+
 * Fix cap shell to properly recognize sudo prompt [Mark Imbriaco, barnaby, Jamis Buck]
 
 * Git SCM module [Garry Dolley, Geoffrey Grosenbach, Scott Chacon]
diff --git a/lib/capistrano/recipes/upgrade.rb b/lib/capistrano/recipes/upgrade.rb
index 90d725e7..c604cf42 100644
--- a/lib/capistrano/recipes/upgrade.rb
+++ b/lib/capistrano/recipes/upgrade.rb
@@ -10,7 +10,7 @@ namespace :upgrade do
     tag file used in Capistrano 2.x. It is non-destructive and may be safely \
     run any number of times.
   DESC
-  task :revisions do
+  task :revisions, :except => { :no_release => true } do
     revisions = capture("cat #{deploy_to}/revisions.log")
 
     mapping = {}