diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..867a3f08
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,13 @@
+Please fill in the fields below to submit an issue or feature request.  The
+more information that is provided, the better.
+
+
+**Description of issue or feature request**:
+
+
+**Current behavior**:
+
+
+**Expected behavior**:
+
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..85e1ed9a
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+Please fill in the fields below to submit a pull request.  The more information
+that is provided, the better.
+
+**Fixes issue #**:
+
+**Description of the changes being introduced by the pull request**:
+
+**Please verify and check that the pull request fulfills the following
+requirements**:
+
+- [ ] The code follows the [Code Style Guidelines](https://github.com/secure-systems-lab/code-style-guidelines#code-style-guidelines)
+- [ ] Tests have been added for the bug fix or new feature
+- [ ] Docs have been added for the bug fix or new feature
+
+