diff --git a/seahub/settings.py b/seahub/settings.py
index 859f2ca757..8011d72eef 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -251,6 +251,9 @@ ENABLE_UPLOAD_FOLDER = False
 # enable resumable fileupload or not
 ENABLE_RESUMABLE_FILEUPLOAD = False
 
+## maxNumberOfFiles for fileupload
+MAX_NUMBER_OF_FILES_FOR_FILEUPLOAD = 500
+
 # enable encrypt library
 ENABLE_ENCRYPTED_LIBRARY = True
 
diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html
index 6d21802c2c..837958b592 100644
--- a/seahub/templates/libraries.html
+++ b/seahub/templates/libraries.html
@@ -249,6 +249,7 @@ app["pageOptions"] = {
     guide_enabled: {% if guide_enabled %} true {% else %} false {% endif %},
     enable_upload_folder: {% if enable_upload_folder %} true {% else %} false {% endif %},
     enable_resumable_fileupload: {% if enable_resumable_fileupload %} true {% else %} false {% endif %},
+    max_number_of_files_for_fileupload: {{ max_number_of_files_for_fileupload }},
     enable_thumbnail: {% if enable_thumbnail %} true {% else %} false {% endif %},
     thumbnail_default_size: {{ thumbnail_default_size }},
     thumbnail_size_for_grid: {{ thumbnail_size_for_grid }},
diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html
index 40b5b0eead..3a5b95aff6 100644
--- a/seahub/templates/sysadmin/sysadmin_backbone.html
+++ b/seahub/templates/sysadmin/sysadmin_backbone.html
@@ -98,6 +98,7 @@ app["pageOptions"] = {
     share_link_password_min_length: {{ share_link_password_min_length }},
     enable_upload_folder: {% if enable_upload_folder %} true {% else %} false {% endif %},
     enable_resumable_fileupload: {% if enable_resumable_fileupload %} true {% else %} false {% endif %},
+    max_number_of_files_for_fileupload: {{ max_number_of_files_for_fileupload }},
     thumbnail_default_size: {{ thumbnail_default_size }},
     thumbnail_size_for_grid: {{ thumbnail_size_for_grid }},
     enable_encrypted_library: {% if enable_encrypted_library %} true {% else %} false {% endif %},
diff --git a/seahub/templates/view_shared_upload_link.html b/seahub/templates/view_shared_upload_link.html
index abaf82df7d..18ad6391ba 100644
--- a/seahub/templates/view_shared_upload_link.html
+++ b/seahub/templates/view_shared_upload_link.html
@@ -104,7 +104,7 @@ form.fileupload({
     {% if max_upload_file_size %}
     maxFileSize: {{ max_upload_file_size }}, // in bytes
     {% endif %}
-    maxNumberOfFiles: 500,
+    maxNumberOfFiles: {{ max_number_of_files_for_fileupload }},
     sequentialUploads: true
 })
 .bind('fileuploadadd', function(e, data) {
diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py
index 47023c9ca0..e37275af97 100644
--- a/seahub/views/__init__.py
+++ b/seahub/views/__init__.py
@@ -810,6 +810,7 @@ def libraries(request):
             "sub_lib_enabled": sub_lib_enabled,
             'enable_upload_folder': settings.ENABLE_UPLOAD_FOLDER,
             'enable_resumable_fileupload': settings.ENABLE_RESUMABLE_FILEUPLOAD,
+            'max_number_of_files_for_fileupload': settings.MAX_NUMBER_OF_FILES_FOR_FILEUPLOAD,
             'enable_thumbnail': settings.ENABLE_THUMBNAIL,
             'thumbnail_default_size': settings.THUMBNAIL_DEFAULT_SIZE,
             'thumbnail_size_for_grid': settings.THUMBNAIL_SIZE_FOR_GRID,
diff --git a/seahub/views/repo.py b/seahub/views/repo.py
index 306fa43072..f068942c75 100644
--- a/seahub/views/repo.py
+++ b/seahub/views/repo.py
@@ -28,7 +28,8 @@ from seahub.utils import gen_file_upload_url, gen_dir_share_link, \
     get_file_type_and_ext
 from seahub.settings import ENABLE_UPLOAD_FOLDER, \
     ENABLE_RESUMABLE_FILEUPLOAD, ENABLE_THUMBNAIL, \
-    THUMBNAIL_ROOT, THUMBNAIL_DEFAULT_SIZE, THUMBNAIL_SIZE_FOR_GRID
+    THUMBNAIL_ROOT, THUMBNAIL_DEFAULT_SIZE, THUMBNAIL_SIZE_FOR_GRID, \
+    MAX_NUMBER_OF_FILES_FOR_FILEUPLOAD
 from seahub.utils.file_types import IMAGE
 from seahub.thumbnail.utils import get_share_link_thumbnail_src
 
@@ -290,4 +291,5 @@ def view_shared_upload_link(request, uploadlink):
             'uploadlink': uploadlink,
             'enable_upload_folder': ENABLE_UPLOAD_FOLDER,
             'enable_resumable_fileupload': ENABLE_RESUMABLE_FILEUPLOAD,
+            'max_number_of_files_for_fileupload': MAX_NUMBER_OF_FILES_FOR_FILEUPLOAD,
             }, context_instance=RequestContext(request))
diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py
index 406e6f3dff..cea5ab1ffa 100644
--- a/seahub/views/sysadmin.py
+++ b/seahub/views/sysadmin.py
@@ -88,6 +88,7 @@ def sysadmin(request):
             'enable_sys_admin_view_repo': ENABLE_SYS_ADMIN_VIEW_REPO,
             'enable_upload_folder': settings.ENABLE_UPLOAD_FOLDER,
             'enable_resumable_fileupload': settings.ENABLE_RESUMABLE_FILEUPLOAD,
+            'max_number_of_files_for_fileupload': settings.MAX_NUMBER_OF_FILES_FOR_FILEUPLOAD,
             'enable_thumbnail': settings.ENABLE_THUMBNAIL,
             'thumbnail_default_size': settings.THUMBNAIL_DEFAULT_SIZE,
             'thumbnail_size_for_grid': settings.THUMBNAIL_SIZE_FOR_GRID,
diff --git a/static/scripts/app/views/fileupload.js b/static/scripts/app/views/fileupload.js
index eb351be835..ec1d737c5d 100644
--- a/static/scripts/app/views/fileupload.js
+++ b/static/scripts/app/views/fileupload.js
@@ -68,7 +68,7 @@ define([
                     }
                 },
                 autoUpload:true,
-                maxNumberOfFiles: 500,
+                maxNumberOfFiles: app.pageOptions.max_number_of_files_for_fileupload,
                 sequentialUploads: true
             })
             .bind('fileuploadadd', function(e, data) {