diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..d5af5533dbf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,14 @@
+Please add a meaningful title and a short description of your issue. It's hard to help you if you only add a trackback with no comments or a one-liner.
+
+Add the following details to your report. Especially if you are unsure about that to include. 
+
+- [ ] Your Home Assistant release, `hass --version`
+- [ ] Your operating system 
+- [ ] The component/platform involved
+- [ ] The config entry for the component/platform from your `configuration.yml` file
+- [ ] Your traceback
+
+It helps if you use the formatting options provided by GitHub ;-)
+
+Anyway, make sure that you have **searched** the closed issues first. Thanks!
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..ad8566ecba2
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,19 @@
+This Pull Request includes a
+
+- [ ] Bug fix
+- [ ] New component
+- [ ] New platform
+
+The following changes were made:
+
+-
+-
+-
+
+Example entry for the `configuration.yaml` file (if it's a PR for a component/platform):
+
+```yaml
+
+```
+
+If this PR is related to an existing ticket, please include a link to it as well. Thanks!