diff --git a/source/_includes/custom/grid_item_left.html b/source/_includes/custom/grid_item_left.html
index afc9cca654f..c4ea1b9a922 100644
--- a/source/_includes/custom/grid_item_left.html
+++ b/source/_includes/custom/grid_item_left.html
@@ -29,14 +29,14 @@
   <a href='/components/arduino.html'>
     <img src='/images/supported_brands/arduino.png' />
   </a>
-  <a href='/components/media_player.kodi.html'>
-    <img src='/images/supported_brands/kodi.png' />
-  </a>
   <a href='/components/device_tracker.netgear.html'>
     <img src='/images/supported_brands/netgear.png' />
   </a>
-  <a href='/components/zwave.html'>
-    <img src='/images/supported_brands/z-wave.png' />
+  <a href='/components/media_player.kodi.html'>
+    <img src='/images/supported_brands/kodi.png' />
+  </a>
+  <a href='/components/media_player.plex.html'>
+    <img src='/images/supported_brands/plex.png' />
   </a>
   <a href='/components/device_tracker.luci.html'>
     <img src='/images/supported_brands/openwrt.png' />
diff --git a/source/components/index.markdown b/source/components/index.markdown
index b178b3f5132..b9b5a829238 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -226,6 +226,11 @@ Entities are things that you want to observe within Home Assistant. Support for
 
 <table>
 
+<tr>
+  <td><a href='/components/media_player.denon.html'><img src='/images/supported_brands/denon.png' class='brand overview' /></a></td>
+  <td><a href='/components/media_player.denon.html'>Denon Network Receivers</a></td>
+</tr>
+
 <tr>
   <td><a href='/components/media_player.cast.html'><img src='/images/supported_brands/google_cast.png' class='brand overview' /></a></td>
   <td><a href='/components/media_player.cast.html'>Google Cast</a></td>
@@ -241,19 +246,19 @@ Entities are things that you want to observe within Home Assistant. Support for
   <td><a href='/components/media_player.itunes.html'>iTunes</a></td>
 </tr>
 
-<tr>
-  <td><a href='/components/media_player.mpd.html'><img src='/images/supported_brands/mpd.png' class='brand overview' /></a></td>
-  <td><a href='/components/media_player.mpd.html'>Music Player Daemon (MPD)</a></td>
-</tr>
-
 <tr>
   <td><a href='/components/media_player.squeezebox.html'><img src='/images/supported_brands/logitech.png' class='brand overview' /></a></td>
   <td><a href='/components/media_player.squeezebox.html'>Logitech Squeezebox</a></td>
 </tr>
 
 <tr>
-  <td><a href='/components/media_player.denon.html'><img src='/images/supported_brands/denon.png' class='brand overview' /></a></td>
-  <td><a href='/components/media_player.denon.html'>Denon Network Receivers</a></td>
+  <td><a href='/components/media_player.mpd.html'><img src='/images/supported_brands/mpd.png' class='brand overview' /></a></td>
+  <td><a href='/components/media_player.mpd.html'>Music Player Daemon (MPD)</a></td>
+</tr>
+
+<tr>
+  <td><a href='/components/media_player.plex.html'><img src='/images/supported_brands/plex.png' class='brand overview' /></a></td>
+  <td><a href='/components/media_player.plex.html'>Plex</a></td>
 </tr>
 
 <tr>
diff --git a/source/components/media_player.plex.markdown b/source/components/media_player.plex.markdown
new file mode 100644
index 00000000000..6cfcf432371
--- /dev/null
+++ b/source/components/media_player.plex.markdown
@@ -0,0 +1,25 @@
+---
+layout: page
+title: "Plex"
+description: "Instructions how to integrate Plex into Home Assistant."
+date: 2015-10-05 21:21
+sidebar: false
+comments: false
+sharing: true
+footer: true
+---
+
+<img src='/images/supported_brands/plex.png' class='brand pull-right' />
+The Plex platform allows you to connect a [Plex Media Server](https://plex.tv) to Home Assistant.
+It will allow you to control media playback and see the current playing item.
+
+
+```yaml
+# Example configuration.yaml entry
+media_player:
+  platform: plex
+  # The name of the backend device (Under Plex Media Server > settings > server)
+  name: plex_server
+  user: your_username
+  password: your_secure_password
+```
diff --git a/source/images/supported_brands/plex.png b/source/images/supported_brands/plex.png
new file mode 100644
index 00000000000..fd71d9246d0
Binary files /dev/null and b/source/images/supported_brands/plex.png differ