diff --git a/lib/capistrano/recipes/deploy/scm/cvs.rb b/lib/capistrano/recipes/deploy/scm/cvs.rb
index 6424444c..cadc3088 100644
--- a/lib/capistrano/recipes/deploy/scm/cvs.rb
+++ b/lib/capistrano/recipes/deploy/scm/cvs.rb
@@ -69,7 +69,8 @@ module Capistrano
         def query_revision(revision)
           return revision if revision_type(revision) == :date
           revision = yield(scm(cvs_root, :log, "-r#{revision}")).
-                       grep(/^date:/).
+                       split("\n").
+                       select { |line| line =~ /^date:/ }.
                        map { |line| line[/^date: (.*?);/, 1] }.
                        sort.last + " UTC"
           return revision