diff --git a/source/_components/media_player.roku.markdown b/source/_components/media_player.roku.markdown
deleted file mode 100644
index af72795a3a7..00000000000
--- a/source/_components/media_player.roku.markdown
+++ /dev/null
@@ -1,16 +0,0 @@
----
-layout: page
-title: "Roku Media Player"
-description: "Instructions on how to integrate Roku into Home Assistant."
-date: 2016-05-16 20:0+0000
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: roku.png
-ha_category: Media Player
-ha_release: "0.20"
-ha_iot_class: "Local Polling"
----
-
-To set up the `roku` media player platform, please follow the instructions on the [Roku Component page](/components/roku/).
diff --git a/source/_components/remote.roku.markdown b/source/_components/remote.roku.markdown
deleted file mode 100644
index 38a31283611..00000000000
--- a/source/_components/remote.roku.markdown
+++ /dev/null
@@ -1,60 +0,0 @@
----
-layout: page
-title: "Roku Remote"
-description: "Instructions on how to integrate Roku into Home Assistant."
-date: 2018-10-17 20:0+0000
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: roku.png
-ha_category: Remote
-ha_release: 0.86
-ha_iot_class: "Local Polling"
----
- 
-The `roku` remote platform allows you to send remote control buttons to a Roku device. It is automatically set up when a Roku is configured; please see [Roku Component page](/components/roku/) for configuration details.
- 
-At the moment, the following buttons are supported:
-
-- back
-- backspace
-- channel_down
-- channel_up
-- down
-- enter
-- find_remote
-- forward
-- home
-- info
-- input_av1
-- input_hdmi1
-- input_hdmi2
-- input_hdmi3
-- input_hdmi4
-- input_tuner
-- left
-- literal
-- play
-- power
-- replay
-- reverse
-- right
-- search
-- select
-- up
-- volume_down
-- volume_mute
-- volume_up
-
-A typical service call for pressing several buttons looks like this.
-
-```yaml
-service: remote.send_command
-data:
-  entity_id: remote.roku
-  command:
-    - left
-    - left
-    - select
-```
\ No newline at end of file
diff --git a/source/_components/roku.markdown b/source/_components/roku.markdown
index b3d7aacb057..906111b3b4d 100644
--- a/source/_components/roku.markdown
+++ b/source/_components/roku.markdown
@@ -8,19 +8,30 @@ comments: false
 sharing: true
 footer: true
 logo: roku.png
-ha_category: Hub
+ha_category:
+  - Hub
+  - Media Player
+  - Remote
 ha_iot_class: "Local Polling"
 ha_release: 0.86
+redirect_from:
+  - /components/remote.roku/
+  - /components/media_player.roku/
 ---
 
-The [Roku](http://www.roku.com/) component allows integration of Roku [media players](/components/media_player.roku) and [remotes](/components/remote.roku/) which will be automatically discovered if you enable the [discovery component](/components/discovery/).
+The [Roku](http://www.roku.com/) component allows integration of Roku, which will be automatically discovered if you enable the [discovery component](/components/discovery/).
+
+There is currently support for the following device types within Home Assistant:
+
+- Media Player
+- Remote
 
 The `roku` component can also be forced to load by adding the following lines to your `configuration.yaml`:
 
 ```yaml
 # Example configuration.yaml entry
 roku:
-  - host: 192.168.1.100
+  - host: IP_ADDRESS
 ```
 
 {% configuration %}
@@ -28,10 +39,58 @@ host:
   description: Set the IP address of the Roku device. Use only if you don't want to autodiscover devices.
   required: false
   type: string
-{% endconfiguration %} 
+{% endconfiguration %}
 
 ## {% linkable_title Services %}
 
 ### {% linkable_title Service `roku_scan` %}
 
 Scans the local network for Rokus. All found devices are presented as a persistent notification.
+
+## {% linkable_title Remote %}
+
+The `roku` remote platform allows you to send remote control buttons to a Roku device. It is automatically set up when a Roku is configured.
+
+At the moment, the following buttons are supported:
+
+- back
+- backspace
+- channel_down
+- channel_up
+- down
+- enter
+- find_remote
+- forward
+- home
+- info
+- input_av1
+- input_hdmi1
+- input_hdmi2
+- input_hdmi3
+- input_hdmi4
+- input_tuner
+- left
+- literal
+- play
+- power
+- replay
+- reverse
+- right
+- search
+- select
+- up
+- volume_down
+- volume_mute
+- volume_up
+
+A typical service call for pressing several buttons looks like this.
+
+```yaml
+service: remote.send_command
+data:
+  entity_id: remote.roku
+  command:
+    - left
+    - left
+    - select
+```
\ No newline at end of file