diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..5a65a91
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,26 @@
+Please check if a similar issue already exists or has been closed before before
+opening your issue.
+
+### Description
+
+[Description of the bug or feature]
+
+### Expected behavior
+
+[What you expected to happen]
+
+### Actual behavior
+
+[What actually happened]
+
+### Steps to Reproduce
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+### Versions
+
+  - Prezto commit:
+  - ZSH version:
+  - OS information:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..10326d6
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,11 @@
+Please be sure to check out our [contributing
+guidelines](https://github.com/sorin-ionescu/prezto/blob/master/CONTRIBUTING.md)
+before submitting your pull request.
+
+Fixes #
+
+## Proposed Changes
+
+  -
+  -
+  -