diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 53%
rename from ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index dc02f85f4..2c2e0cfa2 100644
--- a/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,13 +1,20 @@
 ---
-DELETE ME<br/>
+name: Bug report
+about: Create a report to help us improve existing features
+
+---
+
+<!--
+DELETE ME
+
+Use the search function to see if someone else has already submitted the same bug report.
+
 You don't need to adhere to the template strictly. Feel free to leave out information you feel is not important or does not make sense.
 
-If you are submitting a feature request, please read [this](https://github.com/AntennaPod/AntennaPod/blob/develop/CONTRIBUTING.md#how-to-submit-a-feature-request).
-In particular, please not only tell us that you want something (*what*), but also make suggestions *how* it should be implemented.
+If you are experiencing a crash, including the stacktrace will likely get it fixed sooner.
+-->
 
----
-
-**App version:** 1.x (from Google Play/F-Droid/Custom build)
+**App version**: 1.x (from Google Play/F-Droid/Custom build)
 
 **Android version**: 5.x [Please mention if you are using a custom rom!]
 
@@ -17,7 +24,7 @@ In particular, please not only tell us that you want something (*what*), but als
 
 **Current behaviour**:
 
-**First occured**: Version 1.x / about x days/weeks ago
+**First occurred**: Version 1.x / about x days/weeks ago
 
 **Steps to reproduce**:
 
@@ -25,7 +32,7 @@ In particular, please not only tell us that you want something (*what*), but als
 1. Than that
 1. Then
 
-**Environment**: [Settings you have changed, e.g. Auto Download. "Unusual" devices you use, e.g. Bluetooth headphones. Do you still use Prestissimo?]
+**Environment**: [Settings you have changed, e.g. Auto Download. "Unusual" devices you use, e.g. Bluetooth headphones. Do you still use Prestissimo? Did you select another media player?]
 
 **Stacktrace/Logcat**: 
 ```
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..878b857c8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Request a new feature
+
+---
+
+<!--
+DELETE ME
+
+Use the search function to see if someone else has already submitted the same feature request. If there already is another request, please upvote the first post instead of commenting something like "I also want this".
+
+To make it easier for us to keep track of requests, please only make one feature request per issue.
+
+Give a brief explanation about the problem that currently exists and why your requested feature solves this problem.
+
+Try do be as specific as possible. Please not only explain what the feature does, but also how. When your request is about changing or extending the UI, describe what the UI would look like and how the user would interact with it.
+-->
+
+**App version**: 1.x (from Google Play/F-Droid/Custom build)
+
+**Problem you are having**:
+
+**Suggested solution**:
+
+**Screenshots / Drawings / Technical details**: