diff --git a/superset/config.py b/superset/config.py
index 6271ce64c..2d32f973a 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -559,6 +559,9 @@ WEBDRIVER_CONFIGURATION = {}
 # The base URL to query for accessing the user interface
 WEBDRIVER_BASEURL = 'http://0.0.0.0:8080/'
 
+# Send user to a link where they can report bugs
+BUG_REPORT_URL = None
+
 
 try:
     if CONFIG_PATH_ENV_VAR in os.environ:
diff --git a/superset/templates/appbuilder/navbar_right.html b/superset/templates/appbuilder/navbar_right.html
index 5db503981..878e93764 100644
--- a/superset/templates/appbuilder/navbar_right.html
+++ b/superset/templates/appbuilder/navbar_right.html
@@ -17,6 +17,7 @@
   under the License.
 #}
 
+{% set bug_report_url = appbuilder.app.config.get('BUG_REPORT_URL') %}
 {% set locale = session['locale'] %}
 {% if not locale %}
     {% set locale = 'en' %}
@@ -34,6 +35,17 @@
         </ul>
     </li>
 {% endif %}
+{% if bug_report_url %}
+<li>
+  <a
+    tabindex="-1"
+    href="{{ bug_report_url }}"
+    title="Report a bug"
+  >
+    <i class="fa fa-bug"></i>&nbsp;
+  </a>
+</li>
+{% endif %}
 {% if languages.keys()|length > 1 %}
 <li class="dropdown">
     <a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">