diff --git a/docs/conf.py b/docs/conf.py
index d1d5065006215..fbc75e9854587 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@
 master_doc = 'index'
 
 # General information about the project.
-project = "Superset's documentation"
+project = "Apache Superset"
 copyright = None
 author = u'Maxime Beauchemin'
 
diff --git a/docs/index.rst b/docs/index.rst
index 51410395219c3..eba2e94516930 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,10 +1,10 @@
 .. image:: _static/img/s.png
 
-Superset's documentation
-''''''''''''''''''''''''
+Apache Superset (incubating)
+''''''''''''''''''''''''''''
 
-Superset is a data exploration platform designed to be visual, intuitive
-and interactive.
+Apache Superset (incubating) is a modern, enterprise-ready business
+intelligence web application
 
 
 ----------------
@@ -12,25 +12,37 @@ and interactive.
 .. warning:: This project was originally named Panoramix, was renamed to
     Caravel in March 2016, and is currently named Superset as of November 2016
 
+.. important::
+
+    **Disclaimer**: Apache Superset is an effort undergoing incubation at The
+    Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+    Incubation is required of all newly accepted projects until a further
+    review indicates that the infrastructure, communications, and
+    decision making process have stabilized in a manner consistent with
+    other successful ASF projects. While incubation status is not
+    necessarily a reflection of the completeness or stability of
+    the code, it does indicate that the project has yet to be fully
+    endorsed by the ASF.
+
 Overview
 =======================================
 
 Features
 ---------
 
-- A rich set of data visualizations, integrated from some of the best
-  visualization libraries
-- Create and share simple dashboards
-- An extensible, high-granularity security/permission model allowing
-  intricate rules on who can access individual features and the dataset
+- A rich set of data visualizations
+- An easy-to-use interface for exploring and visualizing data
+- Create and share dashboards
 - Enterprise-ready authentication with integration with major authentication
   providers (database, OpenID, LDAP, OAuth & REMOTE_USER through
   Flask AppBuilder)
+- An extensible, high-granularity security/permission model allowing
+  intricate rules on who can access individual features and the dataset
 - A simple semantic layer, allowing users to control how data sources are
   displayed in the UI by defining which fields should show up in which
   drop-down and which aggregation and function metrics are made available
   to the user
-- Integration with most RDBMS through SqlAlchemy
+- Integration with most SQL-speaking RDBMS through SQLAlchemy
 - Deep integration with Druid.io
 
 ------