diff --git a/source/_components/discovery.markdown b/source/_components/discovery.markdown
index 4f9900020b4..4f2a4ed2810 100644
--- a/source/_components/discovery.markdown
+++ b/source/_components/discovery.markdown
@@ -22,6 +22,7 @@ Home Assistant can discover and automatically configure [zeroconf](https://en.wi
  * [Denon network receivers](/components/media_player.denonavr/)
  * [DirecTV receivers](/components/media_player.directv/)
  * [DLNA DMR enabled devices](/components/media_player.dlna_dmr/)
+ * [Enigma2 media player](/components/media_player.enigma2/)
  * [Frontier Silicon internet radios](/components/media_player.frontier_silicon/)
  * [Google Cast](/components/media_player.cast/)
  * [HomeKit](/components/homekit_controller/)
@@ -79,6 +80,7 @@ Valid values for ignore are:
  * `bose_soundtouch`: Bose Soundtouch speakers
  * `denonavr`: Denon network receivers
  * `directv`: DirecTV receivers
+ * `enigma2`: Enigma2 media players
  * `frontier_silicon`: Frontier Silicon internet radios
  * `google_cast`: Google Cast
  * `harmony`: Logitech Harmony Hub
diff --git a/source/_components/media_player.enigma2.markdown b/source/_components/media_player.enigma2.markdown
new file mode 100644
index 00000000000..2b57133e546
--- /dev/null
+++ b/source/_components/media_player.enigma2.markdown
@@ -0,0 +1,52 @@
+---
+layout: page
+title: "Enigma2"
+description: "Instructions on how to integrate an Enigma2 based box running OpenWebif into Home Assistant."
+date: 2019-02-21 12:02
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: openwebif.png
+ha_category: Media Player
+featured: false
+ha_release: 0.90
+ha_iot_class: "Local Polling"
+---
+
+The `enigma2` platform allows you to control a Linux based set-top box which is running [Enigma2](https://github.com/oe-alliance/oe-alliance-enigma2) with the OpenWebif plugin installed.
+
+[OpenWebif](https://github.com/E2OpenPlugins/e2openplugin-OpenWebif) is an open source web interface for Enigma2 based set-top boxes.
+
+Enigma2 devices should be discovered automatically by using the [the discovery component](/components/discovery/).
+
+To manually add a set-top box to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+media_player:
+  - platform: enigma2
+    host: IP_ADDRESS
+```
+
+{% configuration %}
+  host:
+    description: The IP/hostname of the Enigma2 set-top box on your home network.
+    required: true
+    type: string
+  use_channel_icon:
+    description: By default, a screen grab of the current channel is shown. If you prefer the channel icon to be shown instead, set this to true.
+    required: false
+    type: boolean
+    default: false
+  port:
+    description: Port which Openwebif is listening on.
+    required: false
+    type: integer
+    default: 80
+  name:
+    description: A name for easy identification of the device.
+    required: false
+    type: string
+    default: Enigma2 Media Player
+{% endconfiguration %}
diff --git a/source/images/supported_brands/openwebif.png b/source/images/supported_brands/openwebif.png
new file mode 100644
index 00000000000..dcf13e70de7
Binary files /dev/null and b/source/images/supported_brands/openwebif.png differ