diff --git a/lib/tasks/dmsf_maintenance.rake b/lib/tasks/dmsf_maintenance.rake
new file mode 100644
index 00000000..c0367a3e
--- /dev/null
+++ b/lib/tasks/dmsf_maintenance.rake
@@ -0,0 +1,137 @@
+# Redmine plugin for Document Management System "Features"
+#
+# Copyright (C) 2011-15   Karel Picman <karel.picman@kontron.com>
+#
+# 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.
+
+desc <<-END_DESC
+DMSF maintenance task
+  * Remove all files and folders with no database record from the documsnt directory
+
+Available options:
+  *dry_run - No physical deletion but list of unused files and folders only
+
+Example:
+  rake redmine:dmsf_maintenance RAILS_ENV="production"
+  rake redmine:dmsf_maintenance dry_run=1 RAILS_ENV="production"
+END_DESC
+  
+namespace :redmine do
+  task :dmsf_maintenance => :environment do    
+    m = DmsfMaintenance.new
+    begin
+      Dir.chdir(DmsfFile.storage_path)       
+      m.files      
+      if m.dry_run
+        m.result
+      else
+        m.clean
+      end             
+    rescue Exception => e
+      puts e.message
+    end
+  end
+end
+
+class DmsfMaintenance
+  
+  include ActionView::Helpers::NumberHelper
+  
+  attr_accessor :dry_run
+  
+  def initialize
+    @dry_run = ENV['dry_run']
+    @folders_to_delete = Array.new
+    @files_to_delete = Array.new
+  end 
+  
+  def files        
+    Dir.glob("**/*").each do |f|      
+      if Dir.exist?(f)
+        check_dir f
+      else
+        check_file f
+      end      
+    end   
+  end
+  
+  def result    
+    if (@files_to_delete.count == 0) && (@folders_to_delete.count == 0)
+      puts "\nNo orphens!\n\n"
+      return
+    end
+    # Files
+    puts "\nFiles:" if(@files_to_delete.count > 0)
+    size = 0
+    @files_to_delete.each do |f|      
+      s = File.size(f)
+      puts "\t#{f}\t#{number_to_human_size(s)}"
+      size += s
+    end 
+    puts "\n#{@files_to_delete.count} files havn't got a coresponding revision and can be deleted"
+    puts "#{number_to_human_size(size)} can be released\n\n"
+    
+    # Projects
+    puts "\nFolders:" if(@folders_to_delete.count > 0)
+    @folders_to_delete.each do |d|
+      puts "\t#{d}"
+    end
+    puts "\n#{@folders_to_delete.count} directories havn't got coresponding projects and can be deleted\n\n" if(@folders_to_delete.count > 0)
+  end
+  
+  def clean  
+    if (@files_to_delete.count == 0) && (@folders_to_delete.count == 0)
+      puts "\nNo orphens!\n\n"
+      return
+    end
+    # Files
+    puts "\nFiles:" if(@files_to_delete.count > 0)
+    size = 0
+    @files_to_delete.each do |f|      
+      s = File.size(f)
+      puts "\t#{f}\t#{number_to_human_size(s)}"
+      size += s
+      File.delete f
+    end 
+    puts "\n#{@files_to_delete.count} files hadn't got a coresponding revision and has been be deleted" if(@files_to_delete.count > 0)
+    puts "#{number_to_human_size(size)} has been released\n\n" if(@files_to_delete.count > 0)
+    
+    # Projects
+    puts "\nFolders:" if(@folders_to_delete.count > 0)
+    @folders_to_delete.each do |d|
+      puts "\t#{d}"
+      Dir.delete d
+    end
+    puts "\n#{@folders_to_delete.count} directories hadn't got a coresponding projects and has been deleted\n\n" if(@folders_to_delete.count > 0)
+  end
+  
+  private
+  
+  def check_file(file)
+    n = DmsfFileRevision.where(:disk_filename => file).count
+    @files_to_delete << file unless n > 0
+  end
+  
+  def check_dir(directory)   
+    name = Pathname.new(directory).basename.to_s
+    if name =~ /^p_(.*)/      
+      p = Project.find_by_identifier $1      
+      @folders_to_delete << name unless p
+    else
+      puts "#{directory} doesn't seem to be a DMSF folder!"
+    end             
+  end
+
+end
\ No newline at end of file