diff --git a/source/_components/climate.flexit.markdown b/source/_components/climate.flexit.markdown
new file mode 100644
index 0000000000..078b840985
--- /dev/null
+++ b/source/_components/climate.flexit.markdown
@@ -0,0 +1,58 @@
+---
+layout: page
+title: "Flexit A/C controller"
+description: "Instructions how to integrate Flexit A/C unit into Home Assistant."
+date: 2017-06-02 16:30 +0200
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: flexit.png
+ha_category: Climate
+ha_release: 0.47
+ha_iot_class: "Local Polling"
+---
+
+Integrates [Flexit](https://www.flexit.no/en/) Air Conditioning unit into Home Assistant.
+
+Requires an CI66 Modbus Adapter [CI66](https://www.flexit.no/en/products/air_handling_unit/accessories_ahu/modul/modbusadapter_ci66/modbus_adapter_ci66_k2-c2-uni/)
+
+To enable this platform, add the following lines to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+climate:
+  - platform: flexit
+    slave: 21
+```
+
+Configuration variables:
+
+- **slave** (*Required*): The slave ID of the modbus adapter, set using DIP-switches.
+- **name** (*Optional*): Displayed name of the A/C unit
+
+<p class='note'>
+This component requires the [Modbus](/components/modbus/) component to be set up to work
+</p>
+
+Full configuration example including modbus setup shown below:
+
+DIP-switch settings on the CI66:
+1=ON, 2=ON, 3=OFF, 4=ON, 5=OFF, 6=ON, 7=ON, 8=ON
+
+```yaml
+# Full example configuration.yaml entry
+modbus:
+  type: serial
+  method: rtu
+  port: /dev/ttyUSB0
+  baudrate: 56000
+  stopbits: 1
+  bytesize: 8
+  parity: E
+
+climate:
+  - platform: flexit
+    name: Main A/C
+    slave: 21
+```
\ No newline at end of file
diff --git a/source/images/supported_brands/flexit.png b/source/images/supported_brands/flexit.png
new file mode 100644
index 0000000000..8a0dc0c6f8
Binary files /dev/null and b/source/images/supported_brands/flexit.png differ