diff --git a/admin_manual/contents.rst b/admin_manual/contents.rst
index f12f62c31..d03638714 100644
--- a/admin_manual/contents.rst
+++ b/admin_manual/contents.rst
@@ -32,3 +32,4 @@ Enterprise Edition Only
     enterprise_file_management/index
     enterprise_logging/index
     enterprise_firewall/index
+    enterprise_troubleshooting
diff --git a/admin_manual/enterprise_logging/index.rst b/admin_manual/enterprise_logging/index.rst
index 862b5b903..0f3e5d34c 100644
--- a/admin_manual/enterprise_logging/index.rst
+++ b/admin_manual/enterprise_logging/index.rst
@@ -1,6 +1,6 @@
-========================================
+=========================================
 Enterprise Logging Apps (Enterprise only)
-========================================
+=========================================
 
 .. toctree::
     :maxdepth: 2
diff --git a/admin_manual/enterprise_troubleshooting.rst b/admin_manual/enterprise_troubleshooting.rst
new file mode 100644
index 000000000..aea63bee2
--- /dev/null
+++ b/admin_manual/enterprise_troubleshooting.rst
@@ -0,0 +1,21 @@
+==========================
+Enterprise Troubleshooting
+==========================
+
+When you have problems with your ownCloud Enterprise installation, refer to 
+:doc:`../issues/general_troubleshooting` to see if you can resolve your issue 
+without opening a support ticket. If you need to open a support ticket, use the 
+Open Ticket button in your account on 
+`<https://customer.owncloud.com/owncloud/>`_.
+
+Bug reports and trouble tickets usually need a copy of your ownCloud server 
+configuration report. You have two ways to generate a configuration report.
+
+#. Use the :ref:`occ config command <config_commands_label>`.
+#. Use the **Enterprise license key** app on your ownCloud Admin page to 
+   generate the report with the click of a button.
+   
+.. figure:: images/config-report-1.png
+   :alt: Enterprise license key app
+
+Both methods automatically obscure passwords and secrets.
diff --git a/admin_manual/images/config-report-1.png b/admin_manual/images/config-report-1.png
new file mode 100644
index 000000000..89ba48d0f
Binary files /dev/null and b/admin_manual/images/config-report-1.png differ
diff --git a/admin_manual/issues/general_troubleshooting.rst b/admin_manual/issues/general_troubleshooting.rst
index 539ce942c..ce7eed527 100644
--- a/admin_manual/issues/general_troubleshooting.rst
+++ b/admin_manual/issues/general_troubleshooting.rst
@@ -31,7 +31,9 @@ If you think you have found a bug in ownCloud, please:
 * Search for a solution (see the options above)
 * Double-check your configuration
 
-If you can't find a solution, please use our `bugtracker`_.
+If you can't find a solution, please use our `bugtracker`_. You can generate a 
+configuration report with the :ref:`occ config command 
+<config_commands_label>`, with passwords automatically obscured.
 
 .. _the ownCloud Forums: https://forum.owncloud.org
 .. _FAQ page: https://forum.owncloud.org/viewforum.php?f=17
@@ -40,7 +42,7 @@ If you can't find a solution, please use our `bugtracker`_.
 .. _webchat: http://webchat.freenode.net/?channels=owncloud
 .. _Enterprise Edition: https://owncloud.com/lp/community-or-enterprise/
 .. _bugtracker: 
-   https://doc.owncloud.org/server/9.0/developer_manual/bugtracker/index.html
+   https://doc.owncloud.org/server/9.1/developer_manual/bugtracker/index.html
 .. TODO ON RELEASE: Update version number above on release
 
 General Troubleshooting