diff --git a/docs/sources/features/datasources/loki.md b/docs/sources/features/datasources/loki.md
index 2f17287c9aa..5cb5e5b79d3 100644
--- a/docs/sources/features/datasources/loki.md
+++ b/docs/sources/features/datasources/loki.md
@@ -38,7 +38,7 @@ Just add it as a data source and you are ready to query your log data in [Explor
 
 ## Querying Logs
 
-Querying and displaying log data from Loki is available via [Explore](/features/explore), and with [Table panel](/features/panels/table_panel/) in dashboards. Select the Loki data source, and then enter a log query to display your logs.
+Querying and displaying log data from Loki is available via [Explore](/features/explore), and with the [logs panel](/features/panels/logs/) in dashboards. Select the Loki data source, and then enter a log query to display your logs.
 
 ### Log Queries
 
diff --git a/docs/sources/features/panels/logs.md b/docs/sources/features/panels/logs.md
new file mode 100644
index 00000000000..c81723c5df5
--- /dev/null
+++ b/docs/sources/features/panels/logs.md
@@ -0,0 +1,44 @@
++++
+title = "Logs Panel"
+keywords = ["grafana", "dashboard", "documentation", "panels", "logs panel"]
+type = "docs"
+aliases = ["/reference/logs/"]
+[menu.docs]
+name = "Logs"
+parent = "panels"
+weight = 2
++++
+
+# Logs Panel
+
+<img class="screenshot" src="/assets/img/features/logs-panel.png">
+
+> Logs panel is only available in Grafana v6.4+
+
+The logs panel shows log lines from datasources that support logs, e.g., Elastic, Influx, and Loki.
+Typically you would use this panel next to a graph panel to display the log output of a related process.
+
+## Querying Data
+
+The logs panel will show the result of queries that are specified in the **Queries** tab.
+The results of multiple queries will be merged and sorted by time.
+Note that you can scroll inside the panel in case the datasource returns more lines than can be displayed at any one time.
+
+### Query Options
+
+Some datasources (e.g., Loki) allow the use of **Live** tailing to show a steady stream of log messages.
+When the panel is in **Live** mode, results are directly streamed from the datasource and the dashboard's time range is ignored.
+Note that the streaming can put extra effort on the datasource and your browser.
+Usually, the dashboard-wide refresh should be enough to get a recent set of log lines.
+
+To limit the number of lines rendered, you can use the query-wide **Max data points** setting. If it is not set, the datasource will usually enforce a limit.
+
+## Visualization Options
+
+### Columns
+
+1. **Time**: Show/hide the time column. This is the timestamp associated with the log line as reported from the datasource.
+2. **Order**: Set to **Ascending** to show the oldest log lines first.
+
+
+<div class="clearfix"></div>
diff --git a/public/app/plugins/panel/logs/plugin.json b/public/app/plugins/panel/logs/plugin.json
index e2c763da0b3..7453a428dc2 100644
--- a/public/app/plugins/panel/logs/plugin.json
+++ b/public/app/plugins/panel/logs/plugin.json
@@ -2,7 +2,6 @@
   "type": "panel",
   "name": "Logs",
   "id": "logs",
-  "state": "alpha",
 
   "info": {
     "author": {