diff --git a/source/_components/sensor.upnp.markdown b/source/_components/sensor.upnp.markdown
deleted file mode 100644
index 4f0ab268aa7..00000000000
--- a/source/_components/sensor.upnp.markdown
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: page
-title: "UPNP Sensor"
-description: "Instructions on how to integrate UPNP sensors with Home Assistant."
-date: 2017-06-18 12:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: upnp.png
-ha_category: Network
-ha_release: 0.48
-ha_iot_class: Local Polling
----
-
-The `upnp` sensor platform allows one to get the network statistics from your router such as bytes in/out and packets in/out.
-
-To use your UPNP sensor in your installation, you need to set up the [`upnp`](/components/upnp/) component.
diff --git a/source/_components/upnp.markdown b/source/_components/upnp.markdown
index 1c8aad7a87c..c2c6e667aaa 100644
--- a/source/_components/upnp.markdown
+++ b/source/_components/upnp.markdown
@@ -8,14 +8,23 @@ comments: false
 sharing: true
 footer: true
 logo: upnp.png
-ha_category: Network
+ha_category:
+  - Network
+  - Sensor
 ha_release: 0.18
+ha_iot_class: "Local Polling"
+redirect_from:
+  - /components/sensor.upnp/
 ---
 
 The `upnp` component enables you to collect network statistics from your router such as bytes in/out and packets in/out. This information is provided by the [UPnP](https://en.wikipedia.org/wiki/Universal_Plug_and_Play)/[Internet Gateway Device (IGD) Protocol](https://en.wikipedia.org/wiki/Internet_Gateway_Device_Protocol) if enabled on your router.
 
 The IGD can automatically create port forwarding mappings on your router for Home Assistant, exposing your installation to the internet. The mapping will never automatically expire. Upon stopping Home Assistant, the mapping will be removed from your router.
 
+There is currently support for the following device types within Home Assistant:
+
+- **Sensor** - Allows to get the network statistics from your router such as bytes in/out and packets in/out.
+
 Please note that UPnP or NAT-PMP needs to be enabled on your router for this component to work.
 
 ## {% linkable_title Configuration %}