diff --git a/esphomeyaml/components/remote_receiver.rst b/esphomeyaml/components/remote_receiver.rst
index 16a675cfb..49c8c8285 100644
--- a/esphomeyaml/components/remote_receiver.rst
+++ b/esphomeyaml/components/remote_receiver.rst
@@ -27,6 +27,7 @@ Configuration variables:
   - **lg**: Decode and dump LG infrared codes.
   - **nec**: Decode and dump NEC infrared codes.
   - **panasonic**: Decode and dump Panasonic infrared codes.
+  - **samsung**: Decode and dump Samsung infrared codes.
   - **sony**: Decode and dump Sony infrared codes.
   - **rc_switch**: Decode and dump RCSwitch RF codes.
   - **raw**: Print all remote codes in their raw form. Useful for using arbitrary protocols.
diff --git a/esphomeyaml/components/switch/remote_transmitter.rst b/esphomeyaml/components/switch/remote_transmitter.rst
index 1def2aff5..2b122d8fb 100644
--- a/esphomeyaml/components/switch/remote_transmitter.rst
+++ b/esphomeyaml/components/switch/remote_transmitter.rst
@@ -78,6 +78,8 @@ Supported remote codes:
       lg:
         data: 0x01234567890ABC
         nbits: 28
+      samsung:
+        data: 0xE0E01234
       sony:
         data: 0xABCDEF
         nbits: 12
@@ -122,6 +124,10 @@ Configuration variables:
   - **data**: The data bytes to send.
   - **nbits**: The number of bits to send, defaults to 28.
 
+- **samsung**: Send an Samsung IR code.
+
+  - **data**: The data bytes to send.
+
 - **sony**: Send an Sony IR code.
 
   - **data**: The data bytes to send.