diff --git a/source/components/index.markdown b/source/components/index.markdown
index dd3492a4ae1..4a0ca20d9d3 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -103,7 +103,13 @@ Entities are things that you want to observe within Home Assistant. Support for
 <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 devices</a></td>
-  <td>Track what is being played and control playback. (temporarely disabled awaiting protobuf 3 release).</td>
+  <td>Track what is being played and control playback (temporarely disabled awaiting protobuf 3 release).</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>
+  <td>Track what is being played and control playback.</td>
 </tr>
 
 <tr>
diff --git a/source/components/media_player.markdown b/source/components/media_player.markdown
index 02a04bd2578..a4c9d1b6957 100644
--- a/source/components/media_player.markdown
+++ b/source/components/media_player.markdown
@@ -9,7 +9,12 @@ sharing: true
 footer: true
 ---
 
-Interacts with media players on your network. Currently only supports [Chromecasts](/components/media_player.cast.html).
+Interacts with media players on your network.
+
+Currently supported devices:
+
+- [Chromecasts](/components/media_player.cast.html)
+- [Music Player Daemon](/components/media_player.mpd.html)
 
 ## Services
 
diff --git a/source/components/media_player.mpd.markdown b/source/components/media_player.mpd.markdown
new file mode 100644
index 00000000000..0233ecd36a7
--- /dev/null
+++ b/source/components/media_player.mpd.markdown
@@ -0,0 +1,24 @@
+---
+layout: page
+title: "Music Player Daemon support"
+description: "Instructions how to integrate Music Player Daemon into Home Assistant."
+date: 2015-06-02 08:00
+sidebar: false
+comments: false
+sharing: true
+footer: true
+---
+
+<img src='/images/supported_brands/mpd.png' class='brand pull-right' />
+The mpd platform allows you to control a [Music Player Daemon](http://www.musicpd.org/) from Home Assistant. Unfortunatly you will not be able to manipulate the playlist (add or delete songs) or add transitions between the songs. 
+
+To add MPD to your installation, add the following to your `configuration.yaml` file:
+
+```
+media_player:
+  platform: mpd
+  server: 127.0.0.1
+  port: 6600
+  location: bedroom
+```
+
diff --git a/source/images/supported_brands/mpd.png b/source/images/supported_brands/mpd.png
new file mode 100644
index 00000000000..d8b6d96145e
Binary files /dev/null and b/source/images/supported_brands/mpd.png differ