diff --git a/admin_manual/contents.rst b/admin_manual/contents.rst
index b745cadb7..095b2a469 100644
--- a/admin_manual/contents.rst
+++ b/admin_manual/contents.rst
@@ -27,7 +27,5 @@ Enterprise Subscription Only
     enterprise_installation/index
     enterprise_clients/index
     enterprise_external_storage/index
-    enterprise_user_management/index
-    
-..    uncomment this when the app is released and page is published    
-..    enterprise_files_drop/index
\ No newline at end of file
+    enterprise_files_drop/index
+    enterprise_user_management/index
\ No newline at end of file
diff --git a/admin_manual/enterprise_files_drop/files_drop.rst b/admin_manual/enterprise_files_drop/files_drop.rst
new file mode 100644
index 000000000..ba634830d
--- /dev/null
+++ b/admin_manual/enterprise_files_drop/files_drop.rst
@@ -0,0 +1,69 @@
+===================================================
+Enabling Anonymous Uploads with File Drop (ES Only)
+===================================================
+
+The File Drop application, introduced in ownCloud 8.0.3 Enterprise 
+Subscription, allows anyone to upload files with the click of a button to the 
+directory of your choosing, without needing a login, and they cannot see or 
+change the contents of the directory. It is the perfect replacement for 
+attaching large files to email, maintaining an FTP server, and commercial 
+file-sharing services.
+
+When files are uploaded to your File Drop directory, you can manage them just 
+like any other ownCloud share: you may share them, restrict access, edit, and 
+delete them.
+
+Setting Up the File Drop App
+-----------------------------
+
+Setting up File Drop is a matter of a few clicks. First go to your Apps page 
+and enable it.
+
+.. image:: ../images/files-drop-1.png
+
+Now your users will see a configuration section on their Personal pages.
+
+.. image:: ../images/files-drop-2.png
+
+Click the **Choose** button to open a dialog to select your upload directory. 
+You may wish to first create a special upload directory (on your Files page), 
+which in the following example is name **upload**.
+
+.. figure:: ../images/files-drop-3.png
+   :scale: 50% 
+   
+   *Click to enlarge*
+   
+On your Personal page you should now see a URL for your upload directory. Share 
+this URL with anyone you want to allow uploads to your File Drop folder. Note 
+that the maximum upload size in this example is 512MB. (The default 
+ownCloud upload file size limit is 512MB. See 
+:doc:`../configuration_files/big_file_upload_configuration` to learn how to 
+customize this.)
+
+.. image:: ../images/files-drop-4.png
+
+Using the File Drop App
+------------------------
+
+Uploading files via the File Drop app is simple. Open your Web browser to the 
+share URL created by ownCloud:
+
+.. figure:: ../images/files-drop-5.png
+   :scale: 50% 
+
+   *Click to enlarge*
+
+Click the **Click to upload file** button. This opens a file picker, and you 
+select the file or directory you want to upload.
+
+.. figure:: ../images/files-drop-6.png
+   :scale: 50% 
+
+   *Click to enlarge*
+   
+When your upload is completed, you'll see a confirmation message with the 
+filenames.
+
+.. figure:: ../images/files-drop-7.png
+
diff --git a/admin_manual/enterprise_files_drop/index.rst b/admin_manual/enterprise_files_drop/index.rst
new file mode 100644
index 000000000..4bbb089b6
--- /dev/null
+++ b/admin_manual/enterprise_files_drop/index.rst
@@ -0,0 +1,8 @@
+====================================================
+Enabling Anonymous Uploads with Files Drop (ES Only)
+====================================================
+
+.. toctree::
+   :maxdepth: 2
+
+   files_drop
\ No newline at end of file
diff --git a/admin_manual/images/files-drop-1.png b/admin_manual/images/files-drop-1.png
new file mode 100644
index 000000000..92336c26f
Binary files /dev/null and b/admin_manual/images/files-drop-1.png differ
diff --git a/admin_manual/images/files-drop-2.png b/admin_manual/images/files-drop-2.png
new file mode 100644
index 000000000..670c75c49
Binary files /dev/null and b/admin_manual/images/files-drop-2.png differ
diff --git a/admin_manual/images/files-drop-3.png b/admin_manual/images/files-drop-3.png
new file mode 100644
index 000000000..0a52d2c7d
Binary files /dev/null and b/admin_manual/images/files-drop-3.png differ
diff --git a/admin_manual/images/files-drop-4.png b/admin_manual/images/files-drop-4.png
new file mode 100644
index 000000000..1e93cfd8b
Binary files /dev/null and b/admin_manual/images/files-drop-4.png differ
diff --git a/admin_manual/images/files-drop-5.png b/admin_manual/images/files-drop-5.png
new file mode 100644
index 000000000..27aaebb91
Binary files /dev/null and b/admin_manual/images/files-drop-5.png differ
diff --git a/admin_manual/images/files-drop-6.png b/admin_manual/images/files-drop-6.png
new file mode 100644
index 000000000..42bde1b60
Binary files /dev/null and b/admin_manual/images/files-drop-6.png differ
diff --git a/admin_manual/images/files-drop-7.png b/admin_manual/images/files-drop-7.png
new file mode 100644
index 000000000..17781a8eb
Binary files /dev/null and b/admin_manual/images/files-drop-7.png differ
diff --git a/user_manual/files/file_drop.rst b/user_manual/files/file_drop.rst
new file mode 100644
index 000000000..0100e1812
--- /dev/null
+++ b/user_manual/files/file_drop.rst
@@ -0,0 +1,60 @@
+==================================
+Making Anonymous Uploads (ES Only)
+==================================
+
+If your ownCloud administrator (Enterprise Subscription only) has enabled the 
+File Drop application, you may create your own special upload directory so that 
+other people can upload files to you without having to log in to the server, and 
+without being an ownCloud user. They will not be allowed to see the contents of 
+this directory, or to make any changes. This is an excellent alternative to 
+sending large attachments via email, using an FTP server, or using commercial 
+file-sharing services.
+
+Setting Up Your Own File Drop
+-----------------------------
+
+Go to your Personal page and you will see the File Drop configuration section.
+
+.. image:: ../images/files-drop-2.png
+
+Click the **Choose** button to open a dialog to select your upload directory. 
+You may wish to first create a special upload directory (on your Files page), 
+which in the following example is name **upload**.
+
+.. figure:: ../images/files-drop-3.png
+   :scale: 50% 
+   
+   *Click to enlarge*
+   
+On your Personal page you should now see a URL for your upload directory. Share 
+this URL with anyone you want to allow uploads to your File Drop folder. Note 
+that the default maximum upload size in this example is 512MB; this is 
+configurable, so contact your ownCloud administrator if you need a larger 
+limit.
+
+.. image:: ../images/files-drop-4.png
+
+Uploading Files
+---------------
+
+Using the File Drop app is simple. You receive a link to the upload 
+folder, click the link, and then you'll see an ownCloud page with a **Click to 
+upload** button.
+
+.. figure:: ../images/files-drop-5.png
+   :scale: 50% 
+
+   *Click to enlarge*
+   
+This opens a file picker, and you select the file or directory you want to 
+upload.
+
+.. figure:: ../images/files-drop-6.png
+   :scale: 50% 
+
+   *Click to enlarge*
+   
+When your upload is completed, you'll see a confirmation message with the 
+filenames.
+
+.. figure:: ../images/files-drop-7.png
\ No newline at end of file
diff --git a/user_manual/files/index.rst b/user_manual/files/index.rst
index 5354ea834..2ad381a81 100644
--- a/user_manual/files/index.rst
+++ b/user_manual/files/index.rst
@@ -11,6 +11,7 @@ Files & Synchronization
    desktop_mobile_sync
    encrypting_files
    federated_cloud_sharing
+   file_drop
    large_file_upload
    quota
    version_control
diff --git a/user_manual/images/files-drop-1.png b/user_manual/images/files-drop-1.png
new file mode 100644
index 000000000..92336c26f
Binary files /dev/null and b/user_manual/images/files-drop-1.png differ
diff --git a/user_manual/images/files-drop-2.png b/user_manual/images/files-drop-2.png
new file mode 100644
index 000000000..670c75c49
Binary files /dev/null and b/user_manual/images/files-drop-2.png differ
diff --git a/user_manual/images/files-drop-3.png b/user_manual/images/files-drop-3.png
new file mode 100644
index 000000000..0a52d2c7d
Binary files /dev/null and b/user_manual/images/files-drop-3.png differ
diff --git a/user_manual/images/files-drop-4.png b/user_manual/images/files-drop-4.png
new file mode 100644
index 000000000..1e93cfd8b
Binary files /dev/null and b/user_manual/images/files-drop-4.png differ
diff --git a/user_manual/images/files-drop-5.png b/user_manual/images/files-drop-5.png
new file mode 100644
index 000000000..27aaebb91
Binary files /dev/null and b/user_manual/images/files-drop-5.png differ
diff --git a/user_manual/images/files-drop-6.png b/user_manual/images/files-drop-6.png
new file mode 100644
index 000000000..42bde1b60
Binary files /dev/null and b/user_manual/images/files-drop-6.png differ
diff --git a/user_manual/images/files-drop-7.png b/user_manual/images/files-drop-7.png
new file mode 100644
index 000000000..17781a8eb
Binary files /dev/null and b/user_manual/images/files-drop-7.png differ