diff --git a/.coveragerc b/.coveragerc
index 66fd541fcaf..c7d1e4237f5 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -188,6 +188,7 @@ omit =
     homeassistant/components/media_player/denon.py
     homeassistant/components/media_player/denonavr.py
     homeassistant/components/media_player/directv.py
+    homeassistant/components/media_player/dunehd.py
     homeassistant/components/media_player/emby.py
     homeassistant/components/media_player/firetv.py
     homeassistant/components/media_player/gpmdp.py
@@ -309,6 +310,7 @@ omit =
     homeassistant/components/sensor/waqi.py
     homeassistant/components/sensor/xbox_live.py
     homeassistant/components/sensor/yweather.py
+    homeassistant/components/sensor/waqi.py
     homeassistant/components/switch/acer_projector.py
     homeassistant/components/switch/anel_pwrctrl.py
     homeassistant/components/switch/arest.py
diff --git a/homeassistant/components/media_player/dunehd.py b/homeassistant/components/media_player/dunehd.py
new file mode 100644
index 00000000000..7c28ff1190d
--- /dev/null
+++ b/homeassistant/components/media_player/dunehd.py
@@ -0,0 +1,171 @@
+"""
+DuneHD implementation of the media player.
+
+For more details about this platform, please refer to the documentation
+https://home-assistant.io/components/dunehd/
+"""
+from homeassistant.components.media_player import (
+    SUPPORT_PAUSE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_NEXT_TRACK, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_SELECT_SOURCE, PLATFORM_SCHEMA, MediaPlayerDevice)
+from homeassistant.const import (
+    CONF_HOST, CONF_NAME, STATE_OFF, STATE_PAUSED, STATE_ON, STATE_PLAYING)
+
+import homeassistant.helpers.config_validation as cv
+import voluptuous as vol
+
+REQUIREMENTS = ['pdunehd==1.3']
+
+DEFAULT_NAME = "DuneHD"
+
+CONF_SOURCES = "sources"
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Optional(CONF_SOURCES): cv.ordered_dict(cv.string, cv.string),
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})
+
+DUNEHD_PLAYER_SUPPORT = \
+    SUPPORT_PAUSE | SUPPORT_TURN_ON | SUPPORT_TURN_OFF | \
+    SUPPORT_SELECT_SOURCE | SUPPORT_PREVIOUS_TRACK | SUPPORT_NEXT_TRACK
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the media player demo platform."""
+    sources = config.get(CONF_SOURCES, {})
+
+    from pdunehd import DuneHDPlayer
+    add_devices([DuneHDPlayerEntity(
+        DuneHDPlayer(config[CONF_HOST]),
+        config[CONF_NAME],
+        sources)])
+
+
+class DuneHDPlayerEntity(MediaPlayerDevice):
+    """Implementation of the Dune HD player."""
+
+    def __init__(self, player, name, sources):
+        """Setup entity to control Dune HD."""
+        self._player = player
+        self._name = name
+        self._sources = sources
+        self._media_title = None
+        self._state = None
+        self.update()
+
+    def update(self):
+        """Update internal status of the entity."""
+        self._state = self._player.update_state()
+        self.__update_title()
+        return True
+
+    @property
+    def state(self):
+        """Return player state."""
+        state = STATE_OFF
+        if 'playback_position' in self._state:
+            state = STATE_PLAYING
+        if self._state['player_state'] in ('playing', 'buffering'):
+            state = STATE_PLAYING
+        if int(self._state.get('playback_speed', 1234)) == 0:
+            state = STATE_PAUSED
+        if self._state['player_state'] == 'navigator':
+            state = STATE_ON
+        return state
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def volume_level(self):
+        """Volume level of the media player (0..1)."""
+        return int(self._state.get('playback_volume', 0)) / 100
+
+    @property
+    def is_volume_muted(self):
+        """Boolean if volume is currently muted."""
+        return int(self._state.get('playback_mute', 0)) == 1
+
+    @property
+    def source_list(self):
+        """List of available input sources."""
+        return list(self._sources.keys())
+
+    @property
+    def supported_media_commands(self):
+        """Flag of media commands that are supported."""
+        return DUNEHD_PLAYER_SUPPORT
+
+    def volume_up(self):
+        """Volume up media player."""
+        self._state = self._player.volume_up()
+
+    def volume_down(self):
+        """Volume down media player."""
+        self._state = self._player.volume_down()
+
+    def mute_volume(self, mute):
+        """Mute/unmute player volume."""
+        self._state = self._player.mute(mute)
+
+    def turn_off(self):
+        """Turn off media player."""
+        self._media_title = None
+        self._state = self._player.turn_off()
+        self.schedule_update_ha_state()
+
+    def turn_on(self):
+        """Turn off media player."""
+        self._state = self._player.turn_on()
+        self.schedule_update_ha_state()
+
+    def media_play(self):
+        """Play media media player."""
+        self._state = self._player.play()
+        self.schedule_update_ha_state()
+
+    def media_pause(self):
+        """Pause media player."""
+        self._state = self._player.pause()
+        self.schedule_update_ha_state()
+
+    @property
+    def media_title(self):
+        """Current media source."""
+        self.__update_title()
+        if self._media_title:
+            return self._media_title
+        return self._state.get('playback_url', 'Not playing')
+
+    def __update_title(self):
+        if self._state['player_state'] == 'bluray_playback':
+            self._media_title = 'Blu-Ray'
+        elif 'playback_url' in self._state:
+            sources = self._sources
+            sval = sources.values()
+            skey = sources.keys()
+            pburl = self._state['playback_url']
+            if pburl in sval:
+                self._media_title = list(skey)[list(sval).index(pburl)]
+            else:
+                self._media_title = pburl
+
+    def select_source(self, source):
+        """Select input source."""
+        self._media_title = source
+        self._state = self._player.launch_media_url(self._sources.get(source))
+        self.schedule_update_ha_state()
+
+    def media_previous_track(self):
+        """Send previous track command."""
+        self._state = self._player.previous_track()
+        self.schedule_update_ha_state()
+
+    def media_next_track(self):
+        """Send next track command."""
+        self._state = self._player.next_track()
+        self.schedule_update_ha_state()
diff --git a/requirements_all.txt b/requirements_all.txt
index 8406b293780..dd91d9e2ed4 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -307,6 +307,9 @@ paho-mqtt==1.2
 # homeassistant.components.media_player.panasonic_viera
 panasonic_viera==0.2
 
+# homeassistant.components.media_player.dunehd
+pdunehd==1.3
+
 # homeassistant.components.device_tracker.aruba
 # homeassistant.components.device_tracker.asuswrt
 # homeassistant.components.device_tracker.cisco_ios