diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 73%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 3caf25f97..f71a6861d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,12 @@
+---
+name: Bug report
+about: Create a bug report (please do not report security issues here)
+
+---
+
 <!-- Please do not report any security issue here, see file Contributing.adoc -->
 
-## Bug, feature, or question?
+## Bug summary
 
 
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..36ac549a6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,7 @@
+---
+name: Feature request
+about: Request a new feature / enhancement
+
+---
+
+## Feature description
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 000000000..18861845d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,14 @@
+---
+name: Question
+about: Ask a question (please read first FAQ and docs)
+
+---
+
+## Question
+
+
+
+---
+
+- WeeChat version: 
+- OS, distribution and version: