diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a5e7a2762..7f2025ea1 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -260,7 +260,7 @@ class ProjectsController < ApplicationController
     @issues =  Issue.find :all, :order => sort_clause,
 						:include => [ :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
 						:conditions => @query.statement,
-						:limit => 500
+						:limit => Setting.issues_export_limit
 
     ic = Iconv.new('ISO-8859-1', 'UTF-8')    
     export = StringIO.new
@@ -315,7 +315,7 @@ class ProjectsController < ApplicationController
     @issues =  Issue.find :all, :order => sort_clause,
 						:include => [ :author, :status, :tracker, :priority ],
 						:conditions => @query.statement,
-						:limit => 500
+						:limit => Setting.issues_export_limit
 											
     @options_for_rfpdf ||= {}
     @options_for_rfpdf[:file_name] = "export.pdf"
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index 04bb771e7..c4a8d03d4 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -26,6 +26,9 @@
 <p><label><%= l(:setting_attachment_max_size) %></label>
 <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
 
+<p><label><%= l(:setting_issues_export_limit) %></label>
+<%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
+
 <p><label><%= l(:setting_mail_from) %></label>
 <%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
 
diff --git a/config/settings.yml b/config/settings.yml
index 54b3a6c4e..252600b58 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -34,6 +34,9 @@ password_lost:
 attachment_max_size:
   format: int
   default: 5120
+issues_export_limit:
+  format: int
+  default: 500
 mail_from:
   default: redmine@somenet.foo
 text_formatting:
diff --git a/lang/de.yml b/lang/de.yml
index 2af2e1296..2bee78a3c 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -147,6 +147,7 @@ setting_default_language: Rückstellung Sprache
 setting_login_required: Authent. erfordert
 setting_self_registration: Selbstausrichtung ermöglicht
 setting_attachment_max_size: Dateimaximumgröße
+setting_issues_export_limit: Issues export limit
 setting_mail_from: Emission address
 setting_host_name: Host Name
 setting_text_formatting: Textformatierung
diff --git a/lang/en.yml b/lang/en.yml
index 6b75b662a..0696bda56 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -147,6 +147,7 @@ setting_default_language: Default language
 setting_login_required: Authent. required
 setting_self_registration: Self-registration enabled
 setting_attachment_max_size: Attachment max. size
+setting_issues_export_limit: Issues export limit
 setting_mail_from: Emission mail address
 setting_host_name: Host name
 setting_text_formatting: Text formatting
diff --git a/lang/es.yml b/lang/es.yml
index bc66b22d1..9e7cbe9d1 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -147,6 +147,7 @@ setting_default_language: Lengua del defecto
 setting_login_required: Autentif. requerida
 setting_self_registration: Registro permitido
 setting_attachment_max_size: Tamaño máximo del fichero
+setting_issues_export_limit: Issues export limit
 setting_mail_from: Email de la emisión
 setting_host_name: Nombre de anfitrión
 setting_text_formatting: Formato de texto
diff --git a/lang/fr.yml b/lang/fr.yml
index 5b164a46a..77cd839d9 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -147,6 +147,7 @@ setting_default_language: Langue par défaut
 setting_login_required: Authentif. obligatoire
 setting_self_registration: Enregistrement autorisé
 setting_attachment_max_size: Taille max des fichiers
+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