diff --git a/admin_manual/configuration_server/hardening.rst b/admin_manual/configuration_server/hardening.rst
new file mode 100644
index 000000000..4210882ba
--- /dev/null
+++ b/admin_manual/configuration_server/hardening.rst
@@ -0,0 +1,88 @@
+Hardening and security guidance
+===============================
+ownCloud aims to ship with secure defaults that do not need to get modified by administrators. However, in some cases
+some additional security hardening can only be applied in scenarios were the administrator have complete control over the
+ownCloud instance.
+
+This document lists some security hardenings which require manual interaction by administrators.
+
+.. note:: ownCloud will warn you in the administration interface if some critical security relevant options are missing,
+          however in some cases that are considered second level as defense administrators are encouraged to check these
+          hardenings manually.
+
+Use HTTPS
+---------
+Using ownCloud without using an encrypted HTTPS connection might allow attackers in a man-in-the-middle (MITM) situation
+to intercept your users data and passwords. Thus ownCloud always recommends to setup ownCloud behind HTTPS.
+
+How to setup HTTPS on your web server depends on your setup, we recommend to check your distributions vendor information
+on how to configure and setup HTTPS.
+
+Redirect all unencrypted traffic to HTTPS
+*****************************************
+To redirect all HTTP traffic to HTTPS administrators are encouraged to issue a permanent redirect using the 301 statuscode,
+when using Apache this can be achieved by a setting such as the following in the Apache VirtualHosts config:
+
+.. code-block:: none
+
+  <VirtualHost *:80>
+     ServerName cloud.owncloud.com
+     Redirect permanent / https://cloud.owncloud.com/
+  </VirtualHost>
+
+Enable HTTP Strict Transport Security
+*************************************
+While redirecting all traffic to HTTPS is already a good start it will often not completely prevent man-in-the-middle attacks
+for a regular user. Thus administrators are encouraged to set the HTTP Strict Transport Security header which will instruct
+browsers to not allow any connection to the ownCloud instance anymore using HTTPS and a invalid certificate warning will
+often not be able to get bypassed.
+
+This can be achieved by setting the following settings within the Apache VirtualHost file:
+
+.. code-block:: none
+
+  <VirtualHost *:443>
+     ServerName cloud.owncloud.com
+     Header always add Strict-Transport-Security "max-age=15768000"
+  </VirtualHost>
+
+It shall be noted that this requires that the ``mod_headers`` extension to be installed.
+
+Proper SSL configuration
+************************
+Default SSL configurations by web servers are often not state of the art and require fine-tuning for an optimal performance
+and security experience. The available SSL ciphers and options depends completely on your environment and thus giving a
+generic recommendation is not really possible.
+
+We recommend to use the `Mozilla SSL Configuration Generator`_ to generate a suitable configuration suited for your environment,
+furthermore the free `Qualys SSL Labs Tests`_ give a good guidance whether the SSL server was correctly configured.
+
+
+Serve security related Headers by the web server
+------------------------------------------------
+Basic security headers are served by ownCloud already in a default environment. These includes:
+
+- ``X-Content-Type-Options: nosniff``
+	- Instructs some browsers to not sniff the mimetype of files. This is used for example to prevent browsers to interpret text files as JavaScript.
+- ``X-XSS-Protection: 1; mode=block``
+	- Enforces the browsers to enable their browser side Cross-Site-Scripting filter.
+- ``X-Robots-Tag: none``
+	- Instructs search machines to not index these page.
+- ``X-Frame-Options: SAMEORIGIN``
+	- Prevents to embed the ownCloud instance within an iframe from other domains to prevent Clickjacking and other similiar attacks.
+
+However, these headers are added by the applications code in PHP and thus not served on static resources and rely on the
+fact that there is no way to bypass the intended response code path.
+
+For optimal security administrators are encouraged to serve these basic HTTP headers by the web server to enforce them on
+response. To do this Apache has to be configured to use the ``.htaccess`` file as well as the following Apache modules
+needs to be enabled:
+
+- mod_headers
+- mod_env
+
+Administrators can verify whether this security change is active by accessing a static resource served by the web server
+and verify that above mentioned security headers are shipped.
+
+.. _Mozilla SSL Configuration Generator: https://mozilla.github.io/server-side-tls/ssl-config-generator/
+.. _Qualys SSL Labs Tests: https://www.ssllabs.com/ssltest/
\ No newline at end of file
diff --git a/go.php b/go.php
index 1185c3f89..6fd85f1c2 100644
--- a/go.php
+++ b/go.php
@@ -16,6 +16,7 @@ $mapping = array(
     'admin-performance'       => '/admin_manual/configuration_server/performance_tuning.html',
     'admin-config'            => '/admin_manual/configuration_server/config_sample_php_parameters.html',
     'admin-db-conversion'     => '/admin_manual/configuration_database/db_conversion.html',
+    'admin-security'          => '/admin_manual/configuration_server/hardening.html',
 
     'developer-theming'       => '/developer_manual/core/theming.html',