diff --git a/source/_components/climate.wink.markdown b/source/_components/climate.wink.markdown
index be8623cb08f..2520b49fa45 100644
--- a/source/_components/climate.wink.markdown
+++ b/source/_components/climate.wink.markdown
@@ -14,7 +14,7 @@ ha_iot_class: "Cloud Polling"
 ---
 
 
-The Wink climate platform allows you to get data from your [Wink](http://www.wink.com/) thermostats, Air Conditioners, and Water Heaters.
+The Wink climate platform allows you to get data from your [Wink](http://www.wink.com/) thermostats and air conditioners.
 
 The requirement is that you have setup [Wink](/components/wink/).
 
@@ -28,7 +28,6 @@ The requirement is that you have setup [Wink](/components/wink/).
 - Honeywell (No Wink hub required)
 - Generic Z-Wave
 - Quirky Aros window AC unit
-- Rheem Econet water heaters (No Wink hub required)
 
 <p class='note'>
 The above devices are confirmed to work, but others may work as well.
diff --git a/source/_components/water_heater.wink.markdown b/source/_components/water_heater.wink.markdown
new file mode 100644
index 00000000000..aa648d350b9
--- /dev/null
+++ b/source/_components/water_heater.wink.markdown
@@ -0,0 +1,28 @@
+---
+layout: page
+title: "Wink Water Heater"
+description: "Instructions on how to setup the Wink water heaters within Home Assistant."
+date: 2016-11-01 22:36
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: wink.png
+ha_category: water heater
+ha_release: 0.32
+ha_iot_class: "Cloud Polling"
+---
+
+The Wink water heater platform allows you to get data from your [Wink](http://www.wink.com/) Water Heaters.
+
+The requirement is that you have setup [Wink](/components/wink/).
+
+
+### {% linkable_title Supported water heaters %}
+
+- Rheem Econet water heaters (No Wink hub required)
+
+
+<p class='note'>
+Wink water heaters use to live under the `climate` platform prior to release 0.81.
+</p>