diff --git a/framework/core/CONTRIBUTING.md b/framework/core/.github/CONTRIBUTING.md
similarity index 100%
rename from framework/core/CONTRIBUTING.md
rename to framework/core/.github/CONTRIBUTING.md
diff --git a/framework/core/.github/ISSUE_TEMPLATE.md b/framework/core/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..4f940e093
--- /dev/null
+++ b/framework/core/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,26 @@
+> Issues on Github are meant for bug reporting. Please post feature requests on the [discussion forum](https://discuss.flarum.org/t/features).
+---
+> Try to complete the below form as far as you are able and are willing to share. Add a screenshot of the issue if you can.
+
+## Bug report
+- Version of Flarum: x.y.z
+- Website URL where the bug is visible: http://example.com
+- The webserver you are running: apache, nginx or something else
+- PHP version: x.y.z
+- Hosted environment: shared or vps
+- Hosting provider: http://some-amazing-provider.com
+
+## Flarum info
+
+```
+Output of "php flarum info", run this in terminal in your Flarum directory.
+```
+
+## Additional comments
+Some additional information you'd like to share, eg what have you tried so far.
+
+## Log files
+
+```
+Put any relevant logs here.
+```