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 000000000..744c09c17
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,29 @@
+<!--
+The issue tracker is a tool to address bugs.
+Please use the #kivy IRC channel on freenode or Stack Overflow for
+support questions, more information at https://git.io/vM1yQ.
+
+Before opening a new issue, make sure you do the following:
+    * check that your issue isn't already filed: https://git.io/vM1iE
+    * prepare a short, runnable example that reproduces the issue
+    * reproduce the problem with the latest development version of Kivy
+    * double-check that the issue is indeed a bug and not a support request
+-->
+
+### Versions
+
+* Python:
+* OS:
+* Kivy:
+* Kivy installation method:
+
+### Description
+
+// REPLACE ME: What are you trying to get done, what has happened, what went wrong, and what did you expect?
+
+### Code and Logs
+
+```python
+// REPLACE ME: Paste your code and logs here, a template can be found at https://git.io/vM1id.
+
+```