diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..b4588ce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,6 @@
+Reporting an error? It's helpful to know:
+
+* Anymail version
+* ESP (Mailgun, SendGrid, etc.)
+* Versions of Django, requests, python
+* Exact error message and/or stack trace