diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug-report.md
similarity index 57%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug-report.md
index 0f5481f0c..646243812 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,6 +1,17 @@
-### Problem
+---
+name: "\U0001F41B Bug report"
+about: Report a problem with beets
 
-(Describe your problem, feature request, or discussion topic here. If you're reporting a bug, please fill out this and the "Setup" section below. Otherwise, you can delete them.)
+---
+
+<!--
+Describe your problem, feature request, or discussion topic here.
+
+Please fill out this and the "Setup" section below and remember to include
+enough detail so that other people can reproduce the problem.
+-->
+
+### Problem
 
 Running this command in verbose (`-vv`) mode:
 
@@ -14,7 +25,7 @@ Led to this problem:
 (paste here)
 ```
 
-Here's a link to the music files that trigger the bug (if relevant): 
+Here's a link to the music files that trigger the bug (if relevant):
 
 
 ### Setup
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 000000000..5eb651aac
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,26 @@
+---
+name: "\U0001F680 Feature request"
+about: Suggest a new idea for beets
+
+---
+
+### Use case
+
+I'm trying to use beets to...
+
+
+### Solution
+<!--
+Do you have a proposal for how beets should work?
+
+Try to be as specific as possible—for example, you could propose the name for
+a new command-line option or refer to the particular ID3 frame you wish
+were supported.
+-->
+
+
+### Alternatives
+<!--
+Have you tried using an existing plugin to do something similar?
+Is there any current feature that _almost_ does what you need?
+-->