diff --git a/source/_components/camera.neato.markdown b/source/_components/camera.neato.markdown
index f215a087a79..4fccb0b413b 100644
--- a/source/_components/camera.neato.markdown
+++ b/source/_components/camera.neato.markdown
@@ -14,8 +14,6 @@ ha_iot_class: "Cloud Polling"
 ---
 
 
-The `neato` camera platform allows you to view the latest cleaning map of your [Neato Botvac Connected]
-(https://www.neatorobotics.com/robot-vacuum/botvac-connected-series/botvac-connected/).
-
-The requirement is that you have setup your [Neato hub](/components/neato/).
+The `neato` camera platform allows you to view the latest cleaning map of your [Neato Botvac Connected](https://www.neatorobotics.com/robot-vacuum/botvac-connected-series/botvac-connected/).
 
+To add `neato` camera to your installation, follow instructions in [Neato component](/components/neato/).
diff --git a/source/_components/sensor.neato.markdown b/source/_components/sensor.neato.markdown
deleted file mode 100644
index 929135c3321..00000000000
--- a/source/_components/sensor.neato.markdown
+++ /dev/null
@@ -1,19 +0,0 @@
----
-layout: page
-title: "Neato Robotics Sensor"
-description: "Instructions how to integrate a Neato Botvac Connected sensors within Home Assistant."
-date: 2016-11-09 20:11
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: neato.png
-ha_category: Sensor
-ha_release: 0.33
-ha_iot_class: "Cloud Polling"
----
-
-The `neato` sensor platform allows you to watch status and battery of your [Neato Botvac Connected](https://www.neatorobotics.com/robot-vacuum/botvac-connected-series/botvac-connected/).
-The status sensor will contain attributes on the robots last clean session.
-
-To add `neato` sensors to your installation, follow instructions in [Neato component](/components/neato/).
diff --git a/source/_components/switch.neato.markdown b/source/_components/switch.neato.markdown
index cc11c8da023..b45fa7f5f2b 100644
--- a/source/_components/switch.neato.markdown
+++ b/source/_components/switch.neato.markdown
@@ -12,6 +12,6 @@ ha_category: Switch
 ha_release: 0.31
 ---
 
-The `neato` switch platform allows you to control your [Neato Botvac Connected](https://www.neatorobotics.com/robot-vacuum/botvac-connected-series/botvac-connected/).
+The `neato` switch platform allows you to enable or disable the schedule of your [Neato Botvac Connected](https://www.neatorobotics.com/robot-vacuum/botvac-connected-series/botvac-connected/).
 
 To add `neato` switch to your installation, follow instructions in [Neato component](/components/neato/).
diff --git a/source/_components/vacuum.neato.markdown b/source/_components/vacuum.neato.markdown
new file mode 100644
index 00000000000..2c0ed934646
--- /dev/null
+++ b/source/_components/vacuum.neato.markdown
@@ -0,0 +1,24 @@
+---
+layout: page
+title: "Neato Robotics Vacuum"
+description: "Instructions how to integrate a Neato Botvac Connected Vacuum within Home Assistant."
+date: 2017-10-18 16:11
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: neato.png
+ha_category: Vacuum
+ha_release: 0.57
+ha_iot_class: "Cloud Polling"
+redirect_from: /components/sensor.neato/
+---
+
+<p class='note'>
+Starting with 0.57 the `neato` sensor was migrated to a vacuum platform.
+</p>
+
+The `neato` vacuum platform allows you to control your [Neato Botvac Connected](https://www.neatorobotics.com/robot-vacuum/botvac-connected-series/botvac-connected/).
+The status will contain attributes on the robots last clean session.
+
+To add `neato` sensors to your installation, follow instructions in [Neato component](/components/neato/).