diff --git a/app/models/file_yard.rb b/app/models/file_yard.rb
index db617238..ef18b2ce 100644
--- a/app/models/file_yard.rb
+++ b/app/models/file_yard.rb
@@ -5,8 +5,9 @@ class FileYard
 
   attr_reader :files_path
 
-  def initialize(files_path)
+  def initialize(files_path, max_upload_size)
     @files_path = files_path
+    @max_upload_size = max_upload_size
     FileUtils.mkdir_p(files_path) unless File.exist?(files_path)
     @files = Dir["#{files_path}/*"].collect{|path| File.basename(path) if File.file?(path) }.compact
   end
diff --git a/app/models/wiki_service.rb b/app/models/wiki_service.rb
index bec013e7..87154f60 100644
--- a/app/models/wiki_service.rb
+++ b/app/models/wiki_service.rb
@@ -29,7 +29,7 @@ module AbstractWikiService
   def file_yard(web)
     raise "Web #{@web.name} does not belong to this wiki service" unless @webs.values.include?(web)
     # TODO cache FileYards
-    FileYard.new("#{self.storage_path}/#{web.address}")
+    FileYard.new("#{self.storage_path}/#{web.address}", web.max_upload_size)
   end
 
   def init_wiki_service
diff --git a/test/unit/file_yard_test.rb b/test/unit/file_yard_test.rb
index 01e468b0..6598caa1 100755
--- a/test/unit/file_yard_test.rb
+++ b/test/unit/file_yard_test.rb
@@ -10,7 +10,7 @@ class FileYardTest < Test::Unit::TestCase
   def setup
     FileUtils.mkdir_p(file_path)
     FileUtils.rm(Dir["#{file_path}/*"])
-    @yard = FileYard.new(file_path)
+    @yard = FileYard.new(file_path, 100)
   end
 
   def test_files