4 files changed, 55 insertions, 13 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 1b707153e..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,13 +0,0 @@
-### Steps to reproduce
-1. 
-2. 
-3. 
-
-### Current behavior
-
-
-### Expected behavior
-
-
-### pylint --version output
-
diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.md b/.github/ISSUE_TEMPLATE/1_Bug_report.md
new file mode 100644
index 000000000..7bbe13351
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1_Bug_report.md
@@ -0,0 +1,26 @@
+---
+name: Bug report
+about: Report a bug in pylint
+
+---
+
+<!--
+  Hi there! Thank you for discovering and submitting an issue.
+
+  Before you submit this, make sure that the issue doesn't already exist
+  or if it is not closed.
+-->
+
+### Steps to reproduce
+1.
+2.
+3.
+
+### Current behavior
+
+
+### Expected behavior
+
+
+### pylint --version output
+
diff --git a/.github/ISSUE_TEMPLATE/2_Feature_request.md b/.github/ISSUE_TEMPLATE/2_Feature_request.md
new file mode 100644
index 000000000..daa030f77
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2_Feature_request.md
@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+<!--
+  Hi there! Thank you for wanting to make pylint better.
+
+  Before you submit this, make sure that this feature wasn't
+  already requested or if it is not already implemented in the master branch.
+-->
+
+### Is your feature request related to a problem? Please describe
+A clear and concise description of what the problem is.
+
+### Describe the solution you'd like
+A clear and concise description of what you want to happen.
+
+
+### Additional context
+Add any other context about the feature request here.
+\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/3_Question.md b/.github/ISSUE_TEMPLATE/3_Question.md
new file mode 100644
index 000000000..8af6e512d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3_Question.md
@@ -0,0 +1,7 @@
+---
+name: Support question
+about: Questions about pylint that are not covered in the documentation (http://pylint.pycqa.org/en/latest/)
+
+---
+
+## Question