diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..54779e3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,18 @@
+
+### General informations
+
+- OfflineIMAP version:
+- server name or domain:
+- CLI options:
+- configuration (remove private data):
+```
+<configuration goes here>
+```
+
+### Log error
+
+```
+<error goes here>
+```
+
+### Step to reproduce the error
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..ed6face
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+
+> Add character x.
+
+- [] I've read the [DCO](http://www.offlineimap.org/doc/dco.html).
+- [] I've read the [Coding Guidelines](http://www.offlineimap.org/doc/CodingGuidelines.html)
+- [] The relevant informations about the changes stands in the commit message, not here.
+- [] Code changes follow the style of the files they change.
+- [] Code is tested (provide details).
+
+### References
+
+- Bug: #no_space
+