diff --git a/homeassistant/components/amcrest.py b/homeassistant/components/amcrest.py
index 90331a3014e..d0e470e3f8e 100644
--- a/homeassistant/components/amcrest.py
+++ b/homeassistant/components/amcrest.py
@@ -14,11 +14,11 @@ from requests.exceptions import ConnectionError as ConnectError
 
 from homeassistant.const import (
     CONF_NAME, CONF_HOST, CONF_PORT, CONF_USERNAME, CONF_PASSWORD,
-    CONF_SENSORS, CONF_SCAN_INTERVAL, HTTP_BASIC_AUTHENTICATION)
+    CONF_SENSORS, CONF_SWITCHES, CONF_SCAN_INTERVAL, HTTP_BASIC_AUTHENTICATION)
 from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['amcrest==1.2.1']
+REQUIREMENTS = ['amcrest==1.2.2']
 DEPENDENCIES = ['ffmpeg']
 
 _LOGGER = logging.getLogger(__name__)
@@ -64,6 +64,12 @@ SENSORS = {
     'ptz_preset': ['PTZ Preset', None, 'mdi:camera-iris'],
 }
 
+# Switch types are defined like: Name, icon
+SWITCHES = {
+    'motion_detection': ['Motion Detection', 'mdi:run-fast'],
+    'motion_recording': ['Motion Recording', 'mdi:record-rec']
+}
+
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.All(cv.ensure_list, [vol.Schema({
         vol.Required(CONF_HOST): cv.string,
@@ -82,6 +88,8 @@ CONFIG_SCHEMA = vol.Schema({
             cv.time_period,
         vol.Optional(CONF_SENSORS):
             vol.All(cv.ensure_list, [vol.In(SENSORS)]),
+        vol.Optional(CONF_SWITCHES):
+            vol.All(cv.ensure_list, [vol.In(SWITCHES)]),
     })])
 }, extra=vol.ALLOW_EXTRA)
 
@@ -116,6 +124,7 @@ def setup(hass, config):
         name = device.get(CONF_NAME)
         resolution = RESOLUTION_LIST[device.get(CONF_RESOLUTION)]
         sensors = device.get(CONF_SENSORS)
+        switches = device.get(CONF_SWITCHES)
         stream_source = STREAM_SOURCE_LIST[device.get(CONF_STREAM_SOURCE)]
 
         username = device.get(CONF_USERNAME)
@@ -145,6 +154,13 @@ def setup(hass, config):
                     CONF_SENSORS: sensors,
                 }, config)
 
+        if switches:
+            discovery.load_platform(
+                hass, 'switch', DOMAIN, {
+                    CONF_NAME: name,
+                    CONF_SWITCHES: switches
+                }, config)
+
     return True
 
 
diff --git a/homeassistant/components/switch/amcrest.py b/homeassistant/components/switch/amcrest.py
new file mode 100755
index 00000000000..0b93bc98b10
--- /dev/null
+++ b/homeassistant/components/switch/amcrest.py
@@ -0,0 +1,92 @@
+"""
+Support for toggling Amcrest IP camera settings.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/switch.amcrest/
+"""
+import asyncio
+import logging
+
+from homeassistant.components.amcrest import DATA_AMCREST, SWITCHES
+from homeassistant.const import (
+    CONF_NAME, CONF_SWITCHES, STATE_OFF, STATE_ON)
+from homeassistant.helpers.entity import ToggleEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['amcrest']
+
+
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Set up the IP Amcrest camera switch platform."""
+    if discovery_info is None:
+        return
+
+    name = discovery_info[CONF_NAME]
+    switches = discovery_info[CONF_SWITCHES]
+    camera = hass.data[DATA_AMCREST][name].device
+
+    all_switches = []
+
+    for setting in switches:
+        all_switches.append(AmcrestSwitch(setting, camera))
+
+    async_add_devices(all_switches, True)
+
+
+class AmcrestSwitch(ToggleEntity):
+    """Representation of an Amcrest IP camera switch."""
+
+    def __init__(self, setting, camera):
+        """Initialize the Amcrest switch."""
+        self._setting = setting
+        self._camera = camera
+        self._name = SWITCHES[setting][0]
+        self._icon = SWITCHES[setting][1]
+        self._state = None
+
+    @property
+    def name(self):
+        """Return the name of the switch if any."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the switch."""
+        return self._state
+
+    @property
+    def is_on(self):
+        """Return true if switch is on."""
+        return self._state == STATE_ON
+
+    def turn_on(self, **kwargs):
+        """Turn setting on."""
+        if self._setting == 'motion_detection':
+            self._camera.motion_detection = 'true'
+        elif self._setting == 'motion_recording':
+            self._camera.motion_recording = 'true'
+
+    def turn_off(self, **kwargs):
+        """Turn setting off."""
+        if self._setting == 'motion_detection':
+            self._camera.motion_detection = 'false'
+        elif self._setting == 'motion_recording':
+            self._camera.motion_recording = 'false'
+
+    def update(self):
+        """Update setting state."""
+        _LOGGER.debug("Polling state for setting: %s ", self._name)
+
+        if self._setting == 'motion_detection':
+            detection = self._camera.is_motion_detector_on()
+        elif self._setting == 'motion_recording':
+            detection = self._camera.is_record_on_motion_detection()
+
+        self._state = STATE_ON if detection else STATE_OFF
+
+    @property
+    def icon(self):
+        """Return the icon for the switch."""
+        return self._icon
diff --git a/requirements_all.txt b/requirements_all.txt
index 7ddac50245c..77b57e23769 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -98,7 +98,7 @@ alarmdecoder==1.13.2
 alpha_vantage==1.9.0
 
 # homeassistant.components.amcrest
-amcrest==1.2.1
+amcrest==1.2.2
 
 # homeassistant.components.media_player.anthemav
 anthemav==1.1.8