diff --git a/src/docs/asciidoc/faq.adoc b/src/docs/asciidoc/faq.adoc
index 2937f9c6c..6090868ed 100644
--- a/src/docs/asciidoc/faq.adoc
+++ b/src/docs/asciidoc/faq.adoc
@@ -499,19 +499,19 @@ You can subscribe to the mailing list by sending an email to link:mailto:firebir
 * Looking for professional support of Jaybird?
 Jaybird is now part of the https://tidelift.com/subscription/pkg/maven-org-firebirdsql-jdbc-jaybird?utm_source=maven-org-firebirdsql-jdbc-jaybird&utm_medium=referral&utm_campaign=docs[Tidelift subscription].
 * The https://firebirdsql.org[Firebird project home page]
-* Firebird support and other https://firebirdsql.org/en/mailing-lists/[Firebird mailing lists] for questions not directly related to Jaybird and java.
+* Firebird-support and other https://firebirdsql.org/en/mailing-lists/[Firebird mailing lists] for questions not directly related to Jaybird and Java.
 
 [#contributing]
 == Contributing
 
 There are several ways you can contribute to Jaybird or Firebird in general:
 
-* Participate on the mailing lists (see https://firebirdsql.org/en/mailing-lists/)
+* Participate on the https://firebirdsql.org/en/mailing-lists/[mailing lists]
 * Report bugs or submit patches on the tracker (see <<reporting-bugs,Reporting Bugs>>)
 * Create pull requests on GitHub (https://github.com/FirebirdSQL/jaybird)
 * Become a developer (for Jaybird contact us on {firebird-java}[firebird-java], for Firebird in general, use the https://groups.google.com/g/firebird-devel[Firebird-devel] mailing list)
 * Donate to the Firebird Foundation (see https://firebirdsql.org/en/donate/)
-* Become a paying member or sponsor of the Firebird Foundation (see https://firebirdsql.org/en/firebird-foundation/)
+* Become a paying Associate, Partner or sponsor of the Firebird Foundation (see https://firebirdsql.org/en/firebird-foundation/)
 
 [#reporting-bugs]
 == Reporting Bugs
diff --git a/src/docs/asciidoc/release_notes.adoc b/src/docs/asciidoc/release_notes.adoc
index 4c5f5faaa..f3a53756d 100644
--- a/src/docs/asciidoc/release_notes.adoc
+++ b/src/docs/asciidoc/release_notes.adoc
@@ -70,7 +70,45 @@ You can subscribe by sending an email to link:mailto:firebird-java+subscribe@goo
 Looking for professional support of Jaybird?
 Jaybird is now part of the https://tidelift.com/subscription/pkg/maven-org-firebirdsql-jdbc-jaybird?utm_source=maven-org-firebirdsql-jdbc-jaybird&utm_medium=referral&utm_campaign=docs[Tidelift subscription].
 
-See also https://firebirdsql.org/file/documentation/drivers_documentation/java/faq.html#where-to-get-help[Where to get help]
+For a more complete list, see the next section.
+
+[#where-to-get-help]
+=== Where to get help
+
+* On https://stackoverflow.com/[Stack Overflow], please tag your questions with _jaybird_ and _firebird_
+* The {firebird-java}[Firebird-Java group] and corresponding mailing list firebird-java@googlegroups.com
++
+You can subscribe to the mailing list by sending an email to link:mailto:firebird-java+subscribe@googlegroups.com[firebird-java+subscribe@googlegroups.com]
+* Looking for professional support of Jaybird?
+Jaybird is now part of the https://tidelift.com/subscription/pkg/maven-org-firebirdsql-jdbc-jaybird?utm_source=maven-org-firebirdsql-jdbc-jaybird&utm_medium=referral&utm_campaign=docs[Tidelift subscription].
+* The https://firebirdsql.org[Firebird project home page]
+* https://groups.google.com/g/firebird-support[Firebird-support] and other https://firebirdsql.org/en/mailing-lists/[Firebird mailing lists] for questions not directly related to Jaybird and Java.
+
+[#contributing]
+=== Contributing
+
+There are several ways you can contribute to Jaybird or Firebird in general:
+
+* Participate on the https://firebirdsql.org/en/mailing-lists/[mailing lists]
+* Report bugs or submit patches on the tracker (see <<reporting-bugs>>)
+* Create pull requests on GitHub (https://github.com/FirebirdSQL/jaybird)
+* Become a developer (for Jaybird contact us on {firebird-java}[firebird-java], for Firebird in general, use the https://groups.google.com/g/firebird-devel[Firebird-devel] mailing list)
+* Donate to the Firebird Foundation (see https://firebirdsql.org/en/donate/)
+* Become a paying Associate, Partner or sponsor of the Firebird Foundation (see https://firebirdsql.org/en/firebird-foundation/)
+
+[#reporting-bugs]
+=== Reporting bugs
+
+The developers follow the {firebird-java}[firebird-java Google Group].
+Join the list and post information about suspected bugs.
+List members may be able to help out to determine if it is an actual bug, provide a workaround and get you going again, whereas bug fixes might take a while.
+
+You can also report bugs in the Jaybird bug tracker, {issues}.
+
+When reporting bugs, please provide a minimal, but complete reproduction, including databases and sourcecode to reproduce the problem.
+Patches to fix bugs are also appreciated.
+Make sure the patch is against a recent master version of the code.
+You can also fork the {jaybird-repo}[jaybird repository] and create pull requests.
 
 [#general-notes]
 == General Notes