diff --git a/.coveragerc b/.coveragerc
index 8253b5522f7..3de008439de 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -422,8 +422,9 @@ omit =
     homeassistant/components/nad/media_player.py
     homeassistant/components/nanoleaf/light.py
     homeassistant/components/neato/camera.py
-    homeassistant/components/neato/vacuum.py
+    homeassistant/components/neato/sensor.py
     homeassistant/components/neato/switch.py
+    homeassistant/components/neato/vacuum.py
     homeassistant/components/nederlandse_spoorwegen/sensor.py
     homeassistant/components/nello/lock.py
     homeassistant/components/nest/*
diff --git a/homeassistant/components/neato/__init__.py b/homeassistant/components/neato/__init__.py
index feaffeaeb6d..c1fb128a1d1 100644
--- a/homeassistant/components/neato/__init__.py
+++ b/homeassistant/components/neato/__init__.py
@@ -110,7 +110,7 @@ async def async_setup_entry(hass, entry):
         _LOGGER.debug("Failed to connect to Neato API")
         return False
 
-    for component in ("camera", "vacuum", "switch"):
+    for component in ("camera", "vacuum", "switch", "sensor"):
         hass.async_create_task(
             hass.config_entries.async_forward_entry_setup(entry, component)
         )
@@ -125,6 +125,7 @@ async def async_unload_entry(hass, entry):
         hass.config_entries.async_forward_entry_unload(entry, "camera"),
         hass.config_entries.async_forward_entry_unload(entry, "vacuum"),
         hass.config_entries.async_forward_entry_unload(entry, "switch"),
+        hass.config_entries.async_forward_entry_unload(entry, "sensor"),
     )
     return True
 
diff --git a/homeassistant/components/neato/sensor.py b/homeassistant/components/neato/sensor.py
new file mode 100644
index 00000000000..0201012cc37
--- /dev/null
+++ b/homeassistant/components/neato/sensor.py
@@ -0,0 +1,104 @@
+"""Support for Neato sensors."""
+import logging
+
+from datetime import timedelta
+from pybotvac.exceptions import NeatoRobotException
+
+from homeassistant.components.sensor import DEVICE_CLASS_BATTERY
+from homeassistant.helpers.entity import Entity
+
+from .const import NEATO_ROBOTS, NEATO_LOGIN, NEATO_DOMAIN, SCAN_INTERVAL_MINUTES
+
+_LOGGER = logging.getLogger(__name__)
+
+SCAN_INTERVAL = timedelta(minutes=SCAN_INTERVAL_MINUTES)
+
+BATTERY = "Battery"
+
+
+async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
+    """Set up the Neato sensor."""
+    pass
+
+
+async def async_setup_entry(hass, entry, async_add_entities):
+    """Set up the Neato sensor using config entry."""
+    dev = []
+    neato = hass.data.get(NEATO_LOGIN)
+    for robot in hass.data[NEATO_ROBOTS]:
+        dev.append(NeatoSensor(neato, robot))
+
+    if not dev:
+        return
+
+    _LOGGER.debug("Adding robots for sensors %s", dev)
+    async_add_entities(dev, True)
+
+
+class NeatoSensor(Entity):
+    """Neato sensor."""
+
+    def __init__(self, neato, robot):
+        """Initialize Neato sensor."""
+        self.robot = robot
+        self.neato = neato
+        self._available = self.neato.logged_in if self.neato is not None else False
+        self._robot_name = f"{self.robot.name} {BATTERY}"
+        self._robot_serial = self.robot.serial
+        self._state = None
+
+    def update(self):
+        """Update Neato Sensor."""
+        if self.neato is None:
+            _LOGGER.error("Error while updating sensor")
+            self._state = None
+            self._available = False
+            return
+
+        try:
+            self.neato.update_robots()
+            self._state = self.robot.state
+        except NeatoRobotException as ex:
+            if self._available:
+                _LOGGER.error("Neato sensor connection error: %s", ex)
+            self._state = None
+            self._available = False
+            return
+
+        self._available = True
+        _LOGGER.debug("self._state=%s", self._state)
+
+    @property
+    def name(self):
+        """Return the name of this sensor."""
+        return self._robot_name
+
+    @property
+    def unique_id(self):
+        """Return unique ID."""
+        return self._robot_serial
+
+    @property
+    def device_class(self):
+        """Return the device class."""
+        return DEVICE_CLASS_BATTERY
+
+    @property
+    def available(self):
+        """Return availability."""
+        return self._available
+
+    @property
+    def state(self):
+        """Return the state."""
+        return self._state["details"]["charge"]
+
+    @property
+    def unit_of_measurement(self):
+        """Return unit of measurement."""
+        return "%"
+
+    @property
+    def device_info(self):
+        """Device info for neato robot."""
+        return {"identifiers": {(NEATO_DOMAIN, self._robot_serial)}}