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 00000000..4f2af041
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,16 @@
+<!-- Provide a summary of the issue in the Title above, please do not "[Tag]" it -->
+
+#### Description
+<!-- Always use the most recent version from ae-mod.info, it might already be fixed -->
+<!-- When describing a bug, tell us what was expected and what the actual behaviour is -->
+<!-- When suggesting a feature, tell us how it should work and why it should be considered -->
+
+#### Environment
+<!-- Include as many relevant details about the environment -->
+<!-- Like the used version, SP/MP, other mods and their version, crashlogs etc -->
+<!-- Please use pastebin or gist for posting the complete crashlog, no excerpt -->
+<!-- The following ones are required, please note "latest" is not a version -->
+
+- Minecraft Version: 
+- AE2 Version: 
+- Forge Version: 
\ No newline at end of file