diff --git a/source/_components/binary_sensor.danfoss_air.markdown b/source/_components/binary_sensor.danfoss_air.markdown
deleted file mode 100644
index 1c150fcb3c9..00000000000
--- a/source/_components/binary_sensor.danfoss_air.markdown
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: page
-title: "Danfoss Air Binary Sensor"
-description: "Instructions for how to setup Danfoss Air binary sensors within Home Assistant."
-date: 2019-01-21 19:03
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: danfoss_air.png
-ha_category: Binary Sensor
-ha_release: "0.87"
-ha_iot_class: "Local Polling"
----
-
-<p class='note'>
-To get your Danfoss Air binary sensors working with Home Assistant, follow the instructions for the general [Danfoss Air component](/components/danfoss_air/).
-</p>
-
-The following binary sensor is supported.
-* **Bypass active:** Indicator if heat recovery is currrently bypassed.
diff --git a/source/_components/danfoss_air.markdown b/source/_components/danfoss_air.markdown
index ac98c7dc0c1..2e45788d1d3 100644
--- a/source/_components/danfoss_air.markdown
+++ b/source/_components/danfoss_air.markdown
@@ -7,10 +7,16 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-ha_category: Climate
+ha_category:
+  - Climate
+  - Binary Sensor
+  - Sensor
 ha_release: "0.87"
 logo: danfoss_air.png
 ha_iot_class: "Local Polling"
+redirect_from:
+  - /components/binary_sensor.danfoss_air/
+  - /components/sensor.danfoss_air/
 ---
 
 The `danfoss_air` component allows you to access information from your Danfoss Air HRV unit.
@@ -18,6 +24,11 @@ The `danfoss_air` component allows you to access information from your Danfoss A
 *Note*: Danfoss Air CCM only accepts one TCP connection at a time. Due to this the component
 will not work while you have the HRV PC-Tool open.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Binary Sensor](#binary-sensor)
+- [Sensor](#sensor)
+
 ```yaml
 # Example configuration.yaml entry
 danfoss_air:
@@ -31,3 +42,18 @@ host:
   type: string
 {% endconfiguration %}
 
+## {% linkable_title Binary sensor %}
+
+The following binary sensor is supported.
+
+- **Bypass active:** Indicator if heat recovery is currrently bypassed.
+
+## {% linkable_title Sensor %}
+
+The following sensors are supported.
+
+- **Outdoor temperature:** Outdoor air temperature.
+- **Supply temperature:** Air temperature of the air supplied to the house.
+- **Extract temperature:** Air temperature of the air extracted from the house.
+- **Exhaust temperature:** Exhausted air temperature.
+- **Remaining filter lifetime:** Reamining filter lifetime measured in percent.
diff --git a/source/_components/sensor.danfoss_air.markdown b/source/_components/sensor.danfoss_air.markdown
deleted file mode 100644
index dacffcc6e08..00000000000
--- a/source/_components/sensor.danfoss_air.markdown
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: page
-title: "Danfoss Air Sensor"
-description: "Instructions for how to setup Danfoss Air sensors within Home Assistant."
-date: 2019-01-21 20:59
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: danfoss_air.png
-ha_category: Sensor
-ha_release: "0.87"
-ha_iot_class: "Local Polling"
----
-
-<p class='note'>
-To get your Danfoss Air sensors working with Home Assistant, follow the instructions for the general [Danfoss Air component](/components/danfoss_air/).
-</p>
-
-The following sensors are supported.
-* **Outdoor temperature:** Outdoor air temperature.
-* **Supply temperature:** Air temperature of the air supplied to the house.
-* **Extract temperature:** Air temperature of the air extracted from the house.
-* **Exhaust temperature:** Exhausted air temperature.
-* **Remaining filter lifetime:** Reamining filter lifetime measured in percent.