diff --git a/docs/sources/features/datasources/_index.md b/docs/sources/features/datasources/_index.md
index 9046c986f98..796f955c153 100644
--- a/docs/sources/features/datasources/_index.md
+++ b/docs/sources/features/datasources/_index.md
@@ -34,6 +34,7 @@ The following datasources are officially supported:
 * [Microsoft SQL Server (MSSQL)]({{< relref "mssql.md" >}})
 * [OpenTSDB]({{< relref "opentsdb.md" >}})
 * [Testdata]({{< relref "testdata.md" >}})
+* [Mixed]({{< relref "mixed.md" >}})
 
 ## Data source plugins
 
diff --git a/docs/sources/features/datasources/mixed.md b/docs/sources/features/datasources/mixed.md
new file mode 100644
index 00000000000..bdd13b66056
--- /dev/null
+++ b/docs/sources/features/datasources/mixed.md
@@ -0,0 +1,19 @@
++++
+title = "Using the Mixed Data Source in Grafana"
+keywords = ["grafana", "dashboard", "documentation", "panels", "mixeddata"]
+type = "docs"
+[menu.docs]
+name = "MixedData"
+parent = "datasources"
+weight = 20
++++
+
+# Mixed Data Source
+
+This Data Source allows you to specify data source on a per query basis.
+
+## Usage
+
+To use the Mixed Data Source, create a new panel or edit an existing panel and navigate to the Queries tab. From the Query popup, select "-- Mixed --". Click "Add Query" and select the desired source.
+
+You cannot change an existing query to use the Mixed Data Source.