diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000000..0dcb075b7d6
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,53 @@
+##### Issue Type:
+
+Please pick one and delete the rest:
+ - Bug Report
+ - Feature Idea
+ - Documentation Report
+
+##### Plugin Name:
+
+Name of the plugin/module/task
+
+##### Ansible Version:
+
+```
+(Paste verbatim output from “ansible --version” here)
+```
+
+##### Ansible Configuration:
+
+Please mention any settings you've changed/added/removed in ansible.cfg
+(or using the ANSIBLE_* environment variables).
+
+##### Environment:
+
+Please mention the OS you are running Ansible from, and the OS you are
+managing, or say “N/A” for anything that isn't platform-specific.
+
+##### Summary:
+
+Please explain the problem briefly.
+
+##### Steps To Reproduce:
+
+For bugs, please show exactly how to reproduce the problem. For new
+features, show how the feature would be used.
+
+```
+(Paste example playbooks or commands here)
+```
+
+You can also paste gist.github.com links for larger files.
+
+##### Expected Results:
+
+What did you expect to happen when running the steps above?
+
+##### Actual Results:
+
+What actually happened?
+
+```
+(Paste verbatim command output here)
+```
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..8f3791f3c91
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,31 @@
+##### Issue Type:
+
+Please pick one and delete the rest:
+ - Feature Pull Request
+ - New Module Pull Request
+ - Bugfix Pull Request
+ - Docs Pull Request
+
+##### Plugin Name:
+
+Name of the plugin/module/task
+
+##### Ansible Version:
+
+```
+(Paste verbatim output from “ansible --version” here)
+```
+
+##### Summary:
+
+Please describe the change and the reason for it.
+
+(If you're fixing an existing issue, please include "Fixes #nnn" in your
+commit message and your description; but you should still explain what
+the change does.)
+
+##### Example output:
+
+```
+(Paste verbatim command output here if necessary)
+```