diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..13fdfa12d1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,26 @@
+<!--
+Thanks for raising a Spring Integration issue. What sort of issue are you raising?
+
+## Question
+
+Please ask questions about how to use something, or to understand why something isn't
+working as you expect it to, on
+[Stack Overflow using the `spring-integration` tag](https://stackoverflow.com/questions/tagged/spring-integration).
+
+## Bug report
+
+Please provide details of the problem, including the version of Spring Integration that you
+are using. If possible, please provide a test case or sample application that reproduces
+the problem. This makes it much easier for us to diagnose the problem and to verify that
+we have fixed it.
+
+## Enhancement
+
+Please start by describing the problem that you are trying to solve. There may already
+be a solution, or there may be a way to solve it that you hadn't considered.
+
+## JIRA
+
+While we will accept GitHub issues for the project, we generally prefer to use
+[JIRA](https://jira.spring.io/browse/INT) to track issues.
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..2640025af0
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+<!--
+Thanks for contributing to Spring Integration. Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with #).
+
+See the [Contributor Guidelines for more information](https://github.com/spring-projects/spring-integration/blob/master/CONTRIBUTING.adoc).
+-->