diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6dd3076e19d409178c0dfd49c1833ae8d7832605..f6bdf519e99218a4bb498026472125b8c64f36f9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -5,10 +5,14 @@ about: Create a report to help us improve
 ---
 
 <!--
-If your issue is a usage question, please submit it to the user mailing-list
-users@riot-os.org or to the developer mailing-list devel@riot-os.org.
-If your issue is related to security, please submit it to the security
-mailing-list security@riot-os.org.
+====================================
+IF YOUR ISSUE IS RELATED TO SECURITY
+====================================
+please submit it to the security mailing-list security@riot-os.org.
+
+If your issue is a question related to the usage of RIOT, please submit it to
+the user mailing-list users@riot-os.org or to the developer mailing-list
+devel@riot-os.org.
 -->
 
 #### Description
diff --git a/.github/ISSUE_TEMPLATE/security_bug.md b/.github/ISSUE_TEMPLATE/security_bug.md
new file mode 100644
index 0000000000000000000000000000000000000000..8b77cbe8e50c4a6cc2f63c245b17a2645a3206e3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/security_bug.md
@@ -0,0 +1,12 @@
+---
+title: 'Security Bug report'
+about: |
+    Don't use the issue tracker for this! Please write an e-mail to
+    security@riot-os.org. The button was just added to advertise this message.
+---
+
+# DON'T USE THE ISSUE TRACKER FOR THIS!
+<!--
+Please write an e-mail to security@riot-os.org. The button was just added to
+advertise this message!
+-->