diff --git a/homeassistant/components/device_tracker/snmp.py b/homeassistant/components/device_tracker/snmp.py
index d0cfcff20ef..8c1bf6dc67b 100644
--- a/homeassistant/components/device_tracker/snmp.py
+++ b/homeassistant/components/device_tracker/snmp.py
@@ -16,7 +16,7 @@ from homeassistant.const import CONF_HOST
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['pysnmp==4.3.10']
+REQUIREMENTS = ['pysnmp==4.4.1']
 
 CONF_COMMUNITY = 'community'
 CONF_AUTHKEY = 'authkey'
@@ -26,11 +26,11 @@ CONF_BASEOID = 'baseoid'
 DEFAULT_COMMUNITY = 'public'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_BASEOID): cv.string,
     vol.Required(CONF_HOST): cv.string,
     vol.Optional(CONF_COMMUNITY, default=DEFAULT_COMMUNITY): cv.string,
     vol.Inclusive(CONF_AUTHKEY, 'keys'): cv.string,
     vol.Inclusive(CONF_PRIVKEY, 'keys'): cv.string,
-    vol.Required(CONF_BASEOID): cv.string
 })
 
 
diff --git a/homeassistant/components/sensor/snmp.py b/homeassistant/components/sensor/snmp.py
index 370b560a892..841ff107826 100644
--- a/homeassistant/components/sensor/snmp.py
+++ b/homeassistant/components/sensor/snmp.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
     CONF_HOST, CONF_NAME, CONF_PORT, CONF_UNIT_OF_MEASUREMENT, STATE_UNKNOWN,
     CONF_VALUE_TEMPLATE)
 
-REQUIREMENTS = ['pysnmp==4.3.10']
+REQUIREMENTS = ['pysnmp==4.4.1']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -41,16 +41,15 @@ SCAN_INTERVAL = timedelta(seconds=10)
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_BASEOID): cv.string,
+    vol.Optional(CONF_ACCEPT_ERRORS, default=False): cv.boolean,
     vol.Optional(CONF_COMMUNITY, default=DEFAULT_COMMUNITY): cv.string,
+    vol.Optional(CONF_DEFAULT_VALUE): cv.string,
     vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
     vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string,
-    vol.Optional(CONF_VERSION, default=DEFAULT_VERSION):
-        vol.In(SNMP_VERSIONS),
-    vol.Optional(CONF_ACCEPT_ERRORS, default=False): cv.boolean,
-    vol.Optional(CONF_DEFAULT_VALUE): cv.string,
-    vol.Optional(CONF_VALUE_TEMPLATE): cv.template
+    vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+    vol.Optional(CONF_VERSION, default=DEFAULT_VERSION): vol.In(SNMP_VERSIONS),
 })
 
 
diff --git a/homeassistant/components/switch/snmp.py b/homeassistant/components/switch/snmp.py
index dc165661daf..d372991c3e2 100644
--- a/homeassistant/components/switch/snmp.py
+++ b/homeassistant/components/switch/snmp.py
@@ -4,17 +4,16 @@ Support for SNMP enabled switch.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/switch.snmp/
 """
-
 import logging
 
 import voluptuous as vol
 
 from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
-from homeassistant.const import (CONF_HOST, CONF_NAME, CONF_PORT,
-                                 CONF_PAYLOAD_ON, CONF_PAYLOAD_OFF)
+from homeassistant.const import (
+    CONF_HOST, CONF_NAME, CONF_PORT, CONF_PAYLOAD_ON, CONF_PAYLOAD_OFF)
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['pysnmp==4.3.10']
+REQUIREMENTS = ['pysnmp==4.4.1']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -22,7 +21,7 @@ CONF_BASEOID = 'baseoid'
 CONF_COMMUNITY = 'community'
 CONF_VERSION = 'version'
 
-DEFAULT_NAME = 'SNMPSwitch'
+DEFAULT_NAME = 'SNMP Switch'
 DEFAULT_HOST = 'localhost'
 DEFAULT_PORT = '161'
 DEFAULT_COMMUNITY = 'private'
@@ -40,11 +39,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_COMMUNITY, default=DEFAULT_COMMUNITY): cv.string,
     vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-    vol.Optional(CONF_VERSION, default=DEFAULT_VERSION):
-        vol.In(SNMP_VERSIONS),
+    vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
     vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
-    vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+    vol.Optional(CONF_VERSION, default=DEFAULT_VERSION): vol.In(SNMP_VERSIONS),
 })
 
 
@@ -59,9 +57,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     payload_on = config.get(CONF_PAYLOAD_ON)
     payload_off = config.get(CONF_PAYLOAD_OFF)
 
-    add_devices([SnmpSwitch(name, host, port, community,
-                            baseoid, version, payload_on,
-                            payload_off)], True)
+    add_devices(
+        [SnmpSwitch(name, host, port, community, baseoid, version, payload_on,
+                    payload_off)], True)
 
 
 class SnmpSwitch(SwitchDevice):
diff --git a/requirements_all.txt b/requirements_all.txt
index 58e8dd387bd..15ad5ec1fe8 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -769,7 +769,7 @@ pysma==0.1.3
 # homeassistant.components.device_tracker.snmp
 # homeassistant.components.sensor.snmp
 # homeassistant.components.switch.snmp
-pysnmp==4.3.10
+pysnmp==4.4.1
 
 # homeassistant.components.sensor.thinkingcleaner
 # homeassistant.components.switch.thinkingcleaner