diff --git a/fetchmail_attach_from_folder/README.rst b/fetchmail_attach_from_folder/README.rst
index f7f3dbaaf..cedb493b4 100644
--- a/fetchmail_attach_from_folder/README.rst
+++ b/fetchmail_attach_from_folder/README.rst
@@ -56,6 +56,16 @@ and attached to the partner in question. After some testing, you might want to
 check `Delete matches` in your folder configuration so that this folder doesn't
 grow indefinitely.
 
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-tools/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
+`here <https://github.com/OCA/server-tools/issues/new?body=module:%20fetchmail_attach_from_folder%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+
 Credits
 =======