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 00000000000..cb3b0d0069a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,11 @@
+#### Brief description of the issue
+
+#### What you expected to happen
+
+#### What actually happened
+
+#### Steps to reproduce
+
+#### Additional info:
+ - **Server Revision**: Found using the "Show Server Revision" verb under the OOC tab.
+ - **Anything else you may wish to add** (Location if it's a mapping issue, etc)