diff --git a/source/_components/notify.flock.markdown b/source/_components/notify.flock.markdown
new file mode 100644
index 00000000000..d164e2151ce
--- /dev/null
+++ b/source/_components/notify.flock.markdown
@@ -0,0 +1,56 @@
+---
+layout: page
+title: "Flock"
+description: "Instructions on how to add Flock notifications to Home Assistant."
+date: 2017-08-17 18:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: flock.png
+ha_category: Notifications
+ha_release: 0.71
+---
+
+
+The `flock` platform uses [Flock.com](https://flock.com) to deliver notifications from Home Assistant.
+
+## {% linkable_title Setup %}
+
+Go to the [Flock.com Admin website](https://admin.flock.com/#!/webhooks) and create a new "Incoming Webhooks". Choose a channel to send the notifications from Home Assistant to, specifiy a name and press *Save and Generate URL*.
+
+<p class='img'>
+  <img src='{{site_root}}/images/components/flock/flock-webhook.png' />
+</p> 
+
+You will need the last part of the URL which is the `access_token` for your room.
+
+<p class='img'>
+  <img src='{{site_root}}/images/components/flock/new-webhook.png' />
+</p> 
+
+## {% linkable_title Configuration %}
+
+To add Flock notifications to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+notify:
+  - name: NOTIFIER_NAME
+    platform: flock
+    access_token: YOUR_ROOM_TOKEN
+```
+
+{% configuration %}
+name:
+  description: "The optional parameter `name` allows multiple notifiers to be created. The notifier will bind to the service `notify.NOTIFIER_NAME`."
+  required: false
+  type: string
+  default: notify
+access_token:
+  description: The last part of the webhook URL.
+  required: true
+  type: string
+{% endconfiguration %}
+
+To use notifications, please see the [getting started with automation page](/getting-started/automation/).
diff --git a/source/images/components/flock/flock-webhook.png b/source/images/components/flock/flock-webhook.png
new file mode 100644
index 00000000000..754c3e91e06
Binary files /dev/null and b/source/images/components/flock/flock-webhook.png differ
diff --git a/source/images/components/flock/new-webhook.png b/source/images/components/flock/new-webhook.png
new file mode 100644
index 00000000000..37c6e062802
Binary files /dev/null and b/source/images/components/flock/new-webhook.png differ
diff --git a/source/images/supported_brands/flock.png b/source/images/supported_brands/flock.png
new file mode 100644
index 00000000000..4a9d123dfa2
Binary files /dev/null and b/source/images/supported_brands/flock.png differ