diff --git a/homeassistant/components/switch/tahoma.py b/homeassistant/components/switch/tahoma.py
index 2904f06b432..bcac038d43b 100644
--- a/homeassistant/components/switch/tahoma.py
+++ b/homeassistant/components/switch/tahoma.py
@@ -12,11 +12,14 @@ import logging
 from homeassistant.components.switch import SwitchDevice
 from homeassistant.components.tahoma import (
     DOMAIN as TAHOMA_DOMAIN, TahomaDevice)
+from homeassistant.const import (STATE_OFF, STATE_ON)
 
 DEPENDENCIES = ['tahoma']
 
 _LOGGER = logging.getLogger(__name__)
 
+ATTR_RSSI_LEVEL = 'rssi_level'
+
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tahoma switches."""
@@ -30,6 +33,33 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 class TahomaSwitch(TahomaDevice, SwitchDevice):
     """Representation a Tahoma Switch."""
 
+    def __init__(self, tahoma_device, controller):
+        """Initialize the switch."""
+        super().__init__(tahoma_device, controller)
+        self._state = STATE_OFF
+        self._skip_update = False
+        self._available = False
+
+    def update(self):
+        """Update method."""
+        # Postpone the immediate state check for changes that take time.
+        if self._skip_update:
+            self._skip_update = False
+            return
+
+        self.controller.get_states([self.tahoma_device])
+
+        if self.tahoma_device.type == 'io:OnOffLightIOComponent':
+            if self.tahoma_device.active_states.get('core:OnOffState') == 'on':
+                self._state = STATE_ON
+            else:
+                self._state = STATE_OFF
+
+        self._available = bool(self.tahoma_device.active_states.get(
+            'core:StatusState') == 'available')
+
+        _LOGGER.debug("Update %s, state: %s", self._name, self._state)
+
     @property
     def device_class(self):
         """Return the class of the device."""
@@ -39,7 +69,23 @@ class TahomaSwitch(TahomaDevice, SwitchDevice):
 
     def turn_on(self, **kwargs):
         """Send the on command."""
-        self.toggle()
+        _LOGGER.debug("Turn on: %s", self._name)
+        if self.tahoma_device.type == 'rts:GarageDoor4TRTSComponent':
+            self.toggle()
+        else:
+            self.apply_action('on')
+            self._skip_update = True
+            self._state = STATE_ON
+
+    def turn_off(self, **kwargs):
+        """Send the off command."""
+        _LOGGER.debug("Turn off: %s", self._name)
+        if self.tahoma_device.type == 'rts:GarageDoor4TRTSComponent':
+            return
+
+        self.apply_action('off')
+        self._skip_update = True
+        self._state = STATE_OFF
 
     def toggle(self, **kwargs):
         """Click the switch."""
@@ -48,4 +94,24 @@ class TahomaSwitch(TahomaDevice, SwitchDevice):
     @property
     def is_on(self):
         """Get whether the switch is in on state."""
-        return False
+        if self.tahoma_device.type == 'rts:GarageDoor4TRTSComponent':
+            return False
+        return bool(self._state == STATE_ON)
+
+    @property
+    def device_state_attributes(self):
+        """Return the device state attributes."""
+        attr = {}
+        super_attr = super().device_state_attributes
+        if super_attr is not None:
+            attr.update(super_attr)
+
+        if 'core:RSSILevelState' in self.tahoma_device.active_states:
+            attr[ATTR_RSSI_LEVEL] = \
+                self.tahoma_device.active_states['core:RSSILevelState']
+        return attr
+
+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return self._available
diff --git a/homeassistant/components/tahoma.py b/homeassistant/components/tahoma.py
index aaa64489168..64071ddb037 100644
--- a/homeassistant/components/tahoma.py
+++ b/homeassistant/components/tahoma.py
@@ -52,6 +52,7 @@ TAHOMA_TYPES = {
     'rts:GarageDoor4TRTSComponent': 'switch',
     'io:VerticalExteriorAwningIOComponent': 'cover',
     'io:HorizontalAwningIOComponent': 'cover',
+    'io:OnOffLightIOComponent': 'switch',
     'rtds:RTDSSmokeSensor': 'smoke',
 }