3 files changed, 60 insertions, 2 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 489e02404d..5e33c144d3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,7 +6,8 @@ about: Report a defect in the software
 ---
 
 <!--
-Thank you for your bug report.
+Thank you for your bug report. If this is your first one,
+please take the time to read the following lines before posting it.
 
 NOTE:
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 2af31318cd..706c022a28 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -6,7 +6,8 @@ about: Propose a feature you would like to see added in the software
 ---
 
 <!--
-Thank you for your feature request.
+Thank you for your feature request. If this is your first one,
+please take the time to read the following lines before posting it.
 
 NOTE:
 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000000..513ad5bbe8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,56 @@
+---
+name: Question
+labels: 'issue: question'
+about: Ask a question about OpenSSL
+---
+
+<!--
+Thank you for your interest in OpenSSL. If this is your first question,
+please take the time to read the following lines before posting it.
+
+For general questions about *using* OpenSSL:
+
+    If you have questions about how to use OpenSSL for specific tasks
+    or how to solve certain problems you have when using it, you might
+    want to ask them on the openssl-users@openssl.org mailing list.
+    There you can get help from a great community of OpenSSL users,
+    not only (but including) the OpenSSL developers. For more information
+    about our mailing lists, see
+    https://www.openssl.org/community/mailinglists.html.
+
+For questions related to build issues:
+
+    Please use the 'Bug report' template.
+
+For other questions:
+
+    Please describe your problem as concisely as possible while giving
+    us enough information to understand your problem. Example code
+    or example commands are highly appreciated if they help us to
+    better understand what you are trying to achieve.
+
+    Also, please remember to tell us which OpenSSL version you are
+    using and whether it is system provided or you built it yourself.
+    In the latter case, please also send us your build configuration.
+    With OpenSSL before 1.1.1, the configuration output comes from the
+    configuration command.  With OpenSSL 1.1.1 and on, you can obtain
+    the information by running the command `perl configdata.pm --dump`
+    in the root directory of the source tree.
+
+Please remember to put ``` lines before and after any commands plus
+output and code, like this:
+
+    ```
+    $ echo output output output
+    output output output
+    ```
+
+    ```
+    #include <stdio.h>
+
+    int main() {
+        int foo = 1;
+        printf("%d\n", foo);
+    }
+    ```
+-->