diff --git a/.gitignore b/.gitignore
index bc734ac2e59..ec8690ad29c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ source/stylesheets/screen.css
 vendor
 node_modules
 source/.jekyll-metadata
+*.iml
+.idea/
\ No newline at end of file
diff --git a/source/_components/lock.lockitron.markdown b/source/_components/lock.lockitron.markdown
new file mode 100644
index 00000000000..c26a16be5f8
--- /dev/null
+++ b/source/_components/lock.lockitron.markdown
@@ -0,0 +1,30 @@
+---
+layout: page
+title: "Lockitron Lock"
+description: "Instructions how to integrate Lockitron locks into Home Assistant."
+date: 2017-03-24 00:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: lockitron.png
+ha_category: Lock
+ha_iot_class: "Cloud Polling"
+ha_release: "0.42"
+---
+
+The `lockitron` platform allows you to control your [Lockitron](https://lockitron.com/) lock from within Home Assistant.
+In order to get the correct `access_token` and `id`, log on to their [developer page](https://api.lockitron.com/), create a new app, and get the access_token they give you.
+Then, call the retrieve all locks function on the page and get the id of your lock (make sure you get your lock's id and not the virtual lock they create for you).
+
+```yaml
+lock:
+  - platform: lockitron
+    access_token: asdf
+    id: fdsa
+```
+
+| Configuration variables| Optional | Description |
+| ---------------------- | -------- | ----------- |
+| `access_token`         |      no  | The security token provided by Lockitron to lock and unlock your lock
+| `id`                   |      no  | The lock id given by Lockitron (should be a GUID)
\ No newline at end of file
diff --git a/source/images/supported_brands/lockitron.png b/source/images/supported_brands/lockitron.png
new file mode 100644
index 00000000000..93237dbf131
Binary files /dev/null and b/source/images/supported_brands/lockitron.png differ