diff --git a/wiki/app/models/wiki_content.rb b/wiki/app/models/wiki_content.rb
index f88ef4927..81a230cd9 100644
--- a/wiki/app/models/wiki_content.rb
+++ b/wiki/app/models/wiki_content.rb
@@ -28,11 +28,18 @@ class WikiContent < ActiveRecord::Base
     attr_protected :data
     
     def text=(plain)
-      gz = Zlib::GzipWriter.new(compressed = StringIO.new)
-      gz.write(plain)
-      gz.close
-      self.data = compressed.string
-      self.compression = 'gzip'
+      case Setting.wiki_compression
+      when 'gzip'
+        gz = Zlib::GzipWriter.new(compressed = StringIO.new)
+        gz.write(plain)
+        gz.close
+        self.data = compressed.string
+        self.compression = 'gzip'
+      else
+        self.data = plain
+        self.compression = ''
+      end
+      plain
     end
     
     def text
diff --git a/wiki/app/views/settings/edit.rhtml b/wiki/app/views/settings/edit.rhtml
index ed42d3478..aac4ab686 100644
--- a/wiki/app/views/settings/edit.rhtml
+++ b/wiki/app/views/settings/edit.rhtml
@@ -38,6 +38,9 @@
 <p><label><%= l(:setting_text_formatting) %></label>
 <%= select_tag 'settings[text_formatting]', options_for_select( [[l(:label_none), 0], ["textile", "textile"]], Setting.text_formatting) %></p>
 
+<p><label><%= l(:setting_wiki_compression) %></label>
+<%= select_tag 'settings[wiki_compression]', options_for_select( [[l(:label_none), 0], ["gzip", "gzip"]], Setting.wiki_compression) %></p>
+
 </div>
 <%= submit_tag l(:button_save) %>
 <% end %>
\ No newline at end of file
diff --git a/wiki/config/settings.yml b/wiki/config/settings.yml
index 7ddbe5293..35cfbde40 100644
--- a/wiki/config/settings.yml
+++ b/wiki/config/settings.yml
@@ -41,6 +41,8 @@ mail_from:
   default: redmine@somenet.foo
 text_formatting:
   default: textile
+wiki_compression:
+  default: gzip
 default_language:
   default: en
 host_name:
diff --git a/wiki/lang/fr.yml b/wiki/lang/fr.yml
index c0568eb5a..79ed13cfa 100644
--- a/wiki/lang/fr.yml
+++ b/wiki/lang/fr.yml
@@ -152,6 +152,7 @@ setting_issues_export_limit: Limite export demandes
 setting_mail_from: Adresse d'émission
 setting_host_name: Nom d'hôte
 setting_text_formatting: Formatage du texte
+setting_wiki_compression: Compression de l'historique wiki
 
 label_user: Utilisateur
 label_user_plural: Utilisateurs