diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 275d26d..0227137 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -14,19 +14,20 @@ FreeBSD, and macOS.  Support may be provided on a best-effort basis to
 other UNIX-like platforms.  We cannot provide support for building
 and/or running iperf3 on Windows, iOS, or Android.
 
-Before asking for help, please use your favorite search engine or
-questions site (such as Stack Overflow) to see if your question might
-have been asked (and maybe even answered) before.
-https://fasterdata.es.net/ has some information on the use of various
-bandwidth measurement tools, including iperf3.  The iperf3
-documentation Web site at http://software.es.net/iperf/ contains
-various bits of helpful information, including a list of
+Before asking for help, please check with your favorite search engine
+or the
+[iperf3 Discussions site on GitHub](http://github.com/esnet/iperf/discussions)
+to see if your question might have been asked (and maybe even
+answered) before.  https://fasterdata.es.net/ has some information on
+the use of various bandwidth measurement tools, including iperf3.  The
+iperf3 documentation Web site at http://software.es.net/iperf/
+contains various bits of helpful information, including a list of
 [frequently-asked questions](http://software.es.net/iperf/faq.html).
 
 We specifically discourage the use of the issue tracker on the iperf3
 GitHub project page for asking questions.  Questions posted in the
-form of issues may go unanswered.  Please use a questions site
-such as [Stack Overflow](http://www.stackoverflow.com)
+form of issues may go unanswered.  Please use the
+[iperf3 Discussions site on GitHub](http://github.com/esnet/iperf/discussions)
 to ask questions of the community or
 alternatively use the iperf3 mailing list at
 iperf-dev@googlegroups.com (posting requires joining the list).
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 359e1f8..9c75869 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,9 +1,10 @@
 _NOTE: The iperf3 issue tracker is for registering bugs, enhancement
 requests, or submissions of code.  It is not a means for asking
 questions about building or using iperf3.  Those are best directed
-towards the iperf3 mailing list at iperf-dev@googlegroups.com or
-question sites such as Stack Overflow
-(http://www.stackoverflow.com/).  A list of frequently-asked questions
+towards the Discussions section for this project at
+https://github.com/esnet/iperf/discussions
+or to the iperf3 mailing list at iperf-dev@googlegroups.com.
+A list of frequently-asked questions
 regarding iperf3 can be found at http://software.es.net/iperf/faq.html._
 
 # Context
@@ -23,7 +24,9 @@ iperf3 on Windows, iOS, or Android._
   libraries, cross-compiling, etc.):
 
 _Please fill out one of the "Bug Report" or "Enhancement Request"
-sections, as appropriate._
+sections, as appropriate. Note that submissions of bug fixes, new
+features, etc. should be done as a pull request at
+https://github.com/esnet/iperf/pulls_
 
 # Bug Report
 
@@ -35,8 +38,6 @@ sections, as appropriate._
 
 * Possible Solution
 
-_Please submit patches or code changes as a pull request._
-
 # Enhancement Request
 
 * Current behavior
@@ -45,5 +46,3 @@ _Please submit patches or code changes as a pull request._
 
 * Implementation notes
 
-_If submitting a proposed implementation of an enhancement request,
-please use the pull request mechanism._