diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 73d3ee05f..5ee848ba9 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -25,6 +25,7 @@ class ProjectsController < ApplicationController
   
   cache_sweeper :project_sweeper, :only => [ :add, :edit, :archive, :unarchive, :destroy ]
   cache_sweeper :issue_sweeper, :only => [ :add_issue ]
+  cache_sweeper :version_sweeper, :only => [ :add_version ]
 
   helper :sort
   include SortHelper
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index e1451f90a..f19dcda9c 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -19,6 +19,8 @@ class VersionsController < ApplicationController
   layout 'base'
   before_filter :find_project, :authorize
 
+  cache_sweeper :version_sweeper, :only => [ :edit, :destroy ]
+  
   def edit
     if request.post? and @version.update_attributes(params[:version])
       flash[:notice] = l(:notice_successful_update)
diff --git a/app/sweepers/version_sweeper.rb b/app/sweepers/version_sweeper.rb
new file mode 100644
index 000000000..e1323e261
--- /dev/null
+++ b/app/sweepers/version_sweeper.rb
@@ -0,0 +1,34 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class VersionSweeper < ActionController::Caching::Sweeper
+  observe Version
+
+  def after_save(version)
+    expire_cache_for(version)
+  end
+  
+  def after_destroy(version)
+    expire_cache_for(version)
+  end
+          
+private
+  def expire_cache_for(version)
+    # calendar and gantt fragments of the project
+    expire_fragment(Regexp.new("projects/(calendar|gantt)/#{version.project_id}\\."))
+  end
+end