2 files changed, 27 insertions, 9 deletions

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5f5ca9743..3092767fd 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,18 +1,36 @@
+<!-- Thank you for your Pull Request. -->
 <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-<!-- Please start by naming your pull request properly e.g. "Add Google Tasks to Todo providers". -->
+<!-- Please start by naming your pull request properly for e.g. "Add Google Tasks to Todo providers". -->
+<!-- Please keep in mind that any text inside "<!--" and "--\>" are comments from us and won't be visible in your bug report, so please don't put any text in them. -->
 
-### Description
+#### Pre-flight Checklist
+
+1. Please remember that if you are logging a bug for some service that has *stopped working* or is *working incorrectly*, please log the bug [here](https://github.com/getferdi/recipes/issues)
+2. If you are requesting support for a **new service** in Ferdi, please log it [here](https://github.com/getferdi/recipes/pulls)
+3. Please remember to read the [self-help documentation](https://github.com/getferdi/ferdi#troubleshooting-recipes-self-help) - in case it helps you unblock yourself for issues related to older versions of recipes that were installed on your machine. (These will get automatically upgraded when you upgrade to the newer versions of Ferdi, but to get new recipes between Ferdi releases, this documentation is quite useful.)
+4. Please consider supporting Ferdi!
+  👉  https://github.com/sponsors/getferdi
+  👉  https://opencollective.com/getferdi/donate
+5. Please ensure you've completed all of the following.
+    - [ ] I have read the [Contributing Guidelines](https://github.com/getferdi/ferdi/blob/develop/CONTRIBUTING.md) for this project.
+    - [ ] I agree to follow the [Code of Conduct](https://github.com/getferdi/ferdi/blob/develop/CODE_OF_CONDUCT.md) that this project adheres to.
+    - [ ] I have searched the [issue tracker](https://github.com/getferdi/ferdi/issues) for a feature request that matches the one I want to file, without success.
+
+#### Description of Change
 <!-- Describe your changes in detail. -->
 
-### Motivation and Context
-<!-- Why is this change required? What problem does it solve? -->
-<!-- If it fixes an open issue, please link to the issue here. -->
+#### Motivation and Context
+<!-- Why is this change required? What problem does it solve?  If it fixes an open issue, please link to the issue here. -->
 
-### Screenshots
+#### Screenshots
 <!-- Remove the section if this does not apply. -->
 
-### Checklist:
-<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
+#### Checklist
+<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
 - [ ] My pull request is properly named
 - [ ] The changes respect the code style of the project (`$ npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding`)
+- [ ] `npm test` passes
 - [ ] I tested/previewed my changes locally
+
+#### Release Notes
+<!-- Please add a one-line description for users of Ferdi to read in the release notes, or 'none' if no notes relevant to such users. Examples and help on special cases: https://github.com/electron/clerk/blob/master/README.md#examples -->
diff --git a/README.md b/README.md
index 587c3dd07..b3d4b685e 100644
--- a/README.md
+++ b/README.md
@@ -241,7 +241,7 @@ Nightly releases are automatically triggered every day ([details](https://github
 
 One of the issues being raised by the awesome users of Ferdi is that certain service-functionalities do not work. As good example of this is either the unread count (badge) stops working for specific services or the gmail logins don't work anymore. (These are just 2 of the most common problems reported).
 
-Since we (the contributors to Ferdi) also eat our own dog food, we use Ferdi as our day-to-day communication app - and most likely have faced the same/similar issue. As a first step before filing an issue, we request you to follow these simple steps to see if the issue gets fixed.
+Since we (the contributors to Ferdi) also eat our own dog food, we use Ferdi as our day-to-day communication app - and most likely have faced the same/similar issue. As a first step before filing an issue, we request you to follow these simple steps to see if the issue gets fixed. These recipes will get automatically upgraded when you upgrade to the newer versions of Ferdi, but to get new recipes **between** Ferdi releases, this documentation is quite useful.
 
 - Make sure you are on the latest version of Ferdi. As of this writing, since the nightly CI packaging process is broken, we request you to download the latest nightly from the link in [Nightly releases](#nightly-releases) section.
 - Stop Ferdi