diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000000..5a2538246c406
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,39 @@
+<!-- Provide a general summary of the issue in the *Title* above -->
+<!-- If the issue is related to a binding, please include its short name in -->
+<!-- square brackets in the title - Example: "[astro] My issue..." -->
+
+<!-- Important: Please contact the openHAB community forum for questions or -->
+<!-- for configuration and usage guidance: https://community.openhab.org -->
+
+<!-- Feel free to delete any comment lines in the template (starting with "<!--") -->
+
+## 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 -->
+
+## Current Behavior
+<!-- If describing a bug, tell us what happens instead of the expected behavior -->
+<!-- Include related log information (preferably debug level) and related configs. -->
+<!-- Use file attachment for log and config information longer than a few lines -->
+<!-- If suggesting a change/improvement, explain the difference from current behavior -->
+<!-- For improvements, discuss at community.openhab.org first and include link to topic -->
+
+## Possible Solution
+<!-- Not obligatory, but suggest a fix/reason for the bug, -->
+<!-- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for Bugs)
+<!-- Provide a link to a live example, or an unambiguous set of steps to -->
+<!-- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+
+## 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: (e.g., openhab and addon versions)
+* Environment name and version (e.g. Chrome 39, node.js 5.4, Java 8, ...):
+* Operating System and version (desktop or mobile, Windows 10, Raspbian Jessie, ...):
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000000..ac08091e28995
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,38 @@
+<!-- Thanks for contributing to the openHAB project! -->
+<!-- Please describe the goal and effect of your PR here. -->
+<!-- Pay attention to the below notes and to *the guidelines* for this repository. -->
+<!-- Feel free to delete any comment lines in the template (starting with "<!--"). -->
+
+<!-- TITLE -->
+
+<!-- Please provide a PR summary in the *Title* above, according to the following schema: -->
+<!-- - If related to one specific addon: Mention the addon shortname in square brackets -->
+<!--   e.g. "[exec]", "[netatmo]" or "[tesla]" -->
+<!-- - If the PR is work in progress: Add "[WIP]" -->
+<!-- - Give a short meaningful description in imperative mood -->
+<!--   e.g. "Add support for device XYZ" or "Fix wrongly handled exception" -->
+<!--   for a new add-on/binding: "Initial contribution" -->
+<!-- Examples: -->
+<!-- - "[homematic] Improve communication with weak signal devices" -->
+<!-- - "[timemachine][WIP] Initial contribution" -->
+<!-- - "Update contribution guidelines on new signing rules" -->
+
+<!-- DESCRIPTION -->
+
+<!-- Please give a few sentences describing the overall goals of the pull request. -->
+<!-- Give enough details to make the improvement and changes of the PR understandable  -->
+<!-- to both developers and tech-savy users. -->
+
+<!-- Please keep the following in mind: -->
+<!-- - What is the classification of the PR, e.g. Bugfix, Improvement, Novel Addition, ... ? -->
+<!-- - Did you describe the PRs motivation and goal? -->
+<!-- - Did you provide a link to any prior discussion, e.g. an issue or community forum thread? -->
+<!-- - Did you describe new features for the end user? -->
+<!-- - Did you describe any noteworthy changes in usage for the end user? --> 
+<!-- - Was the documentation updated accordingly, e.g. the addon README? -->
+<!-- - Does your contribution follow the coding guidelines: -->
+<!--   http://docs.openhab.org/developers/development/guidelines.html -->
+<!-- - Did you check for any (relevant) issues from the static code analysis: -->
+<!--   http://docs.openhab.org/developers/development/bindings.html#static-code-analysis -->
+<!-- - Did you sign-off your work: -->
+<!--   http://docs.openhab.org/developers/contributing/contributing#sign-your-work -->