diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 42c355ba..db4e6437 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,17 +1,44 @@
-### Are you creating an issue in the correct repository?
+## Are you creating an issue in the correct repository?
 
 - When in doubt, create an issue here.
 - If you have an issue with the Jasmine docs, file an issue in the docs repo
   here: https://github.com/jasmine/jasmine.github.io
 - This repository is for the core Jasmine framework
-- If you are using a test runner that wraps Jasmine (Jasmine npm, karma, etc),
-  consider filing an issue with that library if appropriate
+- If you are using a test runner that wraps Jasmine, consider filing an issue with that library if appropriate:
+  - [Jasmine npm](https://github.com/jasmine/jasmine-npm/issues)
+  - [Jasmine gem](https://github.com/jasmine/jasmine-gem/issues)
+  - [Jasmine py](https://github.com/jasmine/jasmine-py/issues)
+  - [Gulp Jasmine Browser](https://github.com/jasmine/gulp-jasmine-browser/issues)
+  - [Karma](https://github.com/karma-runner/karma/issues)
+  - [Grunt Contrib Jasmine](https://github.com/gruntjs/grunt-contrib-jasmine/issues)
 
-### When submitting an issue, please answer the following:
+<!--- Provide a general summary of the issue in the Title above -->
 
- - What version are you using?
- - What environment are you running Jasmine in (node, browser, etc)?
- - How are you running Jasmine (standalone, npm, karma, etc)?
- - If possible, include an example spec that demonstrates your issue.
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
 
- Thanks for using Jasmine!
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Suite that reproduces the behavior (for bugs)
+<!--- Provide a sample suite that reproduces the bug. -->
+```javascript
+describe("sample", function() {
+});
+```
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Version used:
+* Environment name and version (e.g. Chrome 39, node.js 5.4):
+* Operating System and version (desktop or mobile):
+* Link to your project:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..68876a5f
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,30 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+<!--- Describe your changes in detail -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Types of changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+## Checklist:
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+- [ ] My code follows the code style of this project.
+- [ ] My change requires a change to the documentation.
+- [ ] I have updated the documentation accordingly.
+- [ ] I have read the **CONTRIBUTING** document.
+- [ ] I have added tests to cover my changes.
+- [ ] All new and existing tests passed.
+