diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/Bug_Report.md
similarity index 74%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/Bug_Report.md
index fe6b39de..26aed90a 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/Bug_Report.md
@@ -1,3 +1,9 @@
+---
+name: Bug Report
+about: Create a bug report
+
+---
+
 <!-- Have a question? Join #thelounge on freenode -->
 
 * *Node version:* 
diff --git a/.github/ISSUE_TEMPLATE/Feature_Request.md b/.github/ISSUE_TEMPLATE/Feature_Request.md
new file mode 100644
index 00000000..473d18b6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_Request.md
@@ -0,0 +1,10 @@
+---
+name: Feature Request
+about: Request a new feature
+
+---
+
+<!-- Have a question? Join #thelounge on freenode. -->
+<!-- Make sure to check the existing issues prior to submitting your suggestion. -->
+
+### Feature Description