diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 71274ce07..36623984f 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,14 +1,14 @@
 ---
 name: Bug report
-about: A report of an error in libwacom
+about: A report of a bug in libwacom
 
 ---
 
-<!--
-**NOTE:** libwacom is a descriptive library and has no effect on the
-tablet events. Only file a bug for libwacom if the tablet works but does not
-show up in GNOME's configuration panel.
+- **Device name**: <!-- e.g. Wacom Intuos Pro Small -->
+- **Device model identifier**: <!-- e.g. CTH-680 -->
+- **libwacom version**:
 
-If your tablet does not work, please follow the instructions here:
-  https://github.com/linuxwacom/libwacom/wiki/Troubleshooting
--->
+- [ ] I understand that libwacom does affect whether the device works (see [Troubleshooting](https://github.com/linuxwacom/libwacom/wiki/Troubleshooting#my-tablet-doesnt-work))
+
+
+# Bug description
diff --git a/.github/ISSUE_TEMPLATE/New_device_support.md b/.github/ISSUE_TEMPLATE/New_device_support.md
index c168af0d8..f15cc4d4f 100644
--- a/.github/ISSUE_TEMPLATE/New_device_support.md
+++ b/.github/ISSUE_TEMPLATE/New_device_support.md
@@ -5,35 +5,21 @@ about: Request to add a new device to libwacom's database
 ---
 
 <!--
-**NOTE:** libwacom is a descriptive library and has no effect on the
-tablet events. Only file a bug for libwacom if the tablet works but does not
-show up in GNOME's configuration panel.
-
-If your tablet does not work, please follow the instructions here:
-https://github.com/linuxwacom/libwacom/wiki/Troubleshooting
--->
-
-**Device name**
-<!-- e.g. Wacom Intuos Pro Small -->
-> ...
-
-**Device model identifier**
-<!-- e.g. CTH-680 -->
-> ...
+Please read https://github.com/linuxwacom/libwacom/wiki/Adding-a-new-device
 
+In most cases you should file a pull request instead of this issue.
+Pull requests are usually quickly reviewed and merged.
 
-<!--
-**NOTE:** please look at the data/ directory for existing tablet device
-files. These are text files. For most tablets, adding a new device is a
-simple as copying+renaming an existing file and modifying the entries.
+Filing this issue means support for your tablet is likely to get delayed for a
+long time.
+-->
 
-If you do so, please submit a Pull Request instead of this issue.
 
-You will also need a new (alphabetically sorted) entry in the meson.build
-file.
--->
+- **Device name**: <!-- e.g. Wacom Intuos Pro Small -->
+- **Device model identifier**: <!-- e.g. CTH-680 -->
+- **libwacom version**:
 
-**udevadm info output**
-<!-- udevadm info /sys/class/input/eventXXX where XXX is the event node for
-your device -->
+- [ ] I understand that libwacom does affect whether the device works (see [Troubleshooting](https://github.com/linuxwacom/libwacom/wiki/Troubleshooting#my-tablet-doesnt-work))
 
+- [ ] **udevadm info output**: <!-- as attachment! -->
+- [ ] sysinfo issue in [wacom-hid-descriptors](https://github.com/linuxwacom/wacom-hid-descriptors):