diff --git a/.coveragerc b/.coveragerc
index f894d1edd4a..9463e85c2a0 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -203,6 +203,9 @@ omit =
     homeassistant/components/linode.py
     homeassistant/components/*/linode.py
 
+    homeassistant/components/lightwave.py
+    homeassistant/components/*/lightwave.py
+
     homeassistant/components/logi_circle.py
     homeassistant/components/*/logi_circle.py
 
diff --git a/homeassistant/components/light/lightwave.py b/homeassistant/components/light/lightwave.py
new file mode 100644
index 00000000000..50c664d9046
--- /dev/null
+++ b/homeassistant/components/light/lightwave.py
@@ -0,0 +1,88 @@
+"""
+Implements LightwaveRF lights.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.lightwave/
+"""
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light)
+from homeassistant.components.lightwave import LIGHTWAVE_LINK
+from homeassistant.const import CONF_NAME
+
+DEPENDENCIES = ['lightwave']
+
+MAX_BRIGHTNESS = 255
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Find and return LightWave lights."""
+    if not discovery_info:
+        return
+
+    lights = []
+    lwlink = hass.data[LIGHTWAVE_LINK]
+
+    for device_id, device_config in discovery_info.items():
+        name = device_config[CONF_NAME]
+        lights.append(LWRFLight(name, device_id, lwlink))
+
+    async_add_entities(lights)
+
+
+class LWRFLight(Light):
+    """Representation of a LightWaveRF light."""
+
+    def __init__(self, name, device_id, lwlink):
+        """Initialize LWRFLight entity."""
+        self._name = name
+        self._device_id = device_id
+        self._state = None
+        self._brightness = MAX_BRIGHTNESS
+        self._lwlink = lwlink
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        return SUPPORT_BRIGHTNESS
+
+    @property
+    def should_poll(self):
+        """No polling needed for a LightWave light."""
+        return False
+
+    @property
+    def name(self):
+        """Lightwave light name."""
+        return self._name
+
+    @property
+    def brightness(self):
+        """Brightness of this light between 0..MAX_BRIGHTNESS."""
+        return self._brightness
+
+    @property
+    def is_on(self):
+        """Lightwave light is on state."""
+        return self._state
+
+    async def async_turn_on(self, **kwargs):
+        """Turn the LightWave light on."""
+        self._state = True
+
+        if ATTR_BRIGHTNESS in kwargs:
+            self._brightness = kwargs[ATTR_BRIGHTNESS]
+
+        if self._brightness != MAX_BRIGHTNESS:
+            self._lwlink.turn_on_with_brightness(
+                self._device_id, self._name, self._brightness)
+        else:
+            self._lwlink.turn_on_light(self._device_id, self._name)
+
+        self.async_schedule_update_ha_state()
+
+    async def async_turn_off(self, **kwargs):
+        """Turn the LightWave light off."""
+        self._state = False
+        self._lwlink.turn_off(self._device_id, self._name)
+        self.async_schedule_update_ha_state()
diff --git a/homeassistant/components/lightwave.py b/homeassistant/components/lightwave.py
new file mode 100644
index 00000000000..e1aa1664eba
--- /dev/null
+++ b/homeassistant/components/lightwave.py
@@ -0,0 +1,49 @@
+"""
+Support for device connected via Lightwave WiFi-link hub.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/lightwave/
+"""
+import voluptuous as vol
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import (CONF_HOST, CONF_LIGHTS, CONF_NAME,
+                                 CONF_SWITCHES)
+from homeassistant.helpers.discovery import async_load_platform
+
+REQUIREMENTS = ['lightwave==0.15']
+LIGHTWAVE_LINK = 'lightwave_link'
+DOMAIN = 'lightwave'
+
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema(
+        cv.has_at_least_one_key(CONF_LIGHTS, CONF_SWITCHES), {
+            vol.Required(CONF_HOST): cv.string,
+            vol.Optional(CONF_LIGHTS, default={}): {
+                cv.string: vol.Schema({vol.Required(CONF_NAME): cv.string}),
+            },
+            vol.Optional(CONF_SWITCHES, default={}): {
+                cv.string: vol.Schema({vol.Required(CONF_NAME): cv.string}),
+            }
+        })
+}, extra=vol.ALLOW_EXTRA)
+
+
+async def async_setup(hass, config):
+    """Try to start embedded Lightwave broker."""
+    from lightwave.lightwave import LWLink
+
+    host = config[DOMAIN][CONF_HOST]
+    hass.data[LIGHTWAVE_LINK] = LWLink(host)
+
+    lights = config[DOMAIN][CONF_LIGHTS]
+    if lights:
+        hass.async_create_task(async_load_platform(
+            hass, 'light', DOMAIN, lights, config))
+
+    switches = config[DOMAIN][CONF_SWITCHES]
+    if switches:
+        hass.async_create_task(async_load_platform(
+            hass, 'switch', DOMAIN, switches, config))
+
+    return True
diff --git a/homeassistant/components/switch/lightwave.py b/homeassistant/components/switch/lightwave.py
new file mode 100644
index 00000000000..b612cd8dec7
--- /dev/null
+++ b/homeassistant/components/switch/lightwave.py
@@ -0,0 +1,65 @@
+"""
+Implements LightwaveRF switches.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/switch.lightwave/
+"""
+from homeassistant.components.lightwave import LIGHTWAVE_LINK
+from homeassistant.components.switch import SwitchDevice
+from homeassistant.const import CONF_NAME
+
+DEPENDENCIES = ['lightwave']
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Find and return LightWave switches."""
+    if not discovery_info:
+        return
+
+    switches = []
+    lwlink = hass.data[LIGHTWAVE_LINK]
+
+    for device_id, device_config in discovery_info.items():
+        name = device_config[CONF_NAME]
+        switches.append(LWRFSwitch(name, device_id, lwlink))
+
+    async_add_entities(switches)
+
+
+class LWRFSwitch(SwitchDevice):
+    """Representation of a LightWaveRF switch."""
+
+    def __init__(self, name, device_id, lwlink):
+        """Initialize LWRFSwitch entity."""
+        self._name = name
+        self._device_id = device_id
+        self._state = None
+        self._lwlink = lwlink
+
+    @property
+    def should_poll(self):
+        """No polling needed for a LightWave light."""
+        return False
+
+    @property
+    def name(self):
+        """Lightwave switch name."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Lightwave switch is on state."""
+        return self._state
+
+    async def async_turn_on(self, **kwargs):
+        """Turn the LightWave switch on."""
+        self._state = True
+        self._lwlink.turn_on_switch(self._device_id, self._name)
+        self.async_schedule_update_ha_state()
+
+    async def async_turn_off(self, **kwargs):
+        """Turn the LightWave switch off."""
+        self._state = False
+        self._lwlink.turn_off(self._device_id, self._name)
+        self.async_schedule_update_ha_state()
diff --git a/requirements_all.txt b/requirements_all.txt
index 5f439e0dd07..89d011f0927 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -583,6 +583,9 @@ liffylights==0.9.4
 # homeassistant.components.light.osramlightify
 lightify==1.0.6.1
 
+# homeassistant.components.lightwave
+lightwave==0.15
+
 # homeassistant.components.light.limitlessled
 limitlessled==1.1.3