diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 7e8447a6..81e6129d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -36,14 +36,15 @@ quick and effective fashion.
 
 1. Fill in all the fields under **Environment** marked with [ ] by picking the
 correct option for you in each case and deleting the others.
-2. Describe your problem.
-3. Include any debug logs (running the application with verbose logging).
-4. Providing as much information as possible under **Other items if possible**
+2. Fill in the reported information about your environment.
+3. Describe your problem.
+4. Include any debug logs (running the application with verbose logging).
+5. Providing as much information as possible under **Other items if possible**
 will help us locate and fix the problem.
-5. Use [Markdown](https://guides.github.com/features/mastering-markdown/) (see
+6. Use [Markdown](https://guides.github.com/features/mastering-markdown/) (see
 formatting buttons above) and the Preview tab to check what the issue will look
 like.
-6. Delete these instructions from the `Delete Below` to the `Delete Above`
+7. Delete these instructions from the `Delete Below` to the `Delete Above`
 marker lines before submitting this issue.
 
 **IMPORTANT: If you do not follow these instructions and provide the necessary
@@ -53,13 +54,19 @@ details, it may not be possible to resolve your issue.**
 
 ## Environment
 
-- libcoap version (run ``git describe --tags`` to find it):
-
-    // v4.3.0-rc3-41-g25fe796
-- Build System:             [Make|CMake]
+- Build System:             [Make|CMake|Other (which?)]
 - Operating System:         [Windows|Linux|macOS|FreeBSD|Cygwin|Solaris|RIOT|Other (which?)]
 - Operating System Version: [ ]
-- Hosted Environment:       [None|Contiki|LwIP|ESP-IDF|Other (which?)]
+- Hosted Environment:       [None|Contiki|LwIP|ESP-IDF|RIOT|Other (which?)]
+
+## libcoap Configuration Summary
+
+Copy the "libcoap Configuration Summary" output lines here after running
+`./configure` (with any options that you have specified)
+  or
+`cmake ..` (with any -D options that you have specified)
+  or if neither of the above two methods is used (do from within the libcoap directory)
+`git describe --tags`
 
 ## Problem Description
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index d96b521e..12e73717 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -11,11 +11,11 @@ assignees: ''
 
 A clear and concise description of what the problem is. E.g. I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+**Describe the solution you would like**
 
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+**Describe alternatives you have considered**
 
 A clear and concise description of any alternative solutions or features you've considered.
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72b01cc6..b6e58316 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -572,8 +572,11 @@ set(LIBCOAP_PACKAGE_NAME "${PACKAGE_NAME}")
 set(LIBCOAP_PACKAGE_STRING "${PACKAGE_STRING}")
 set(LIBCOAP_PACKAGE_BUGREPORT "${PACKAGE_BUGREPORT}")
 
+message(STATUS "")
+message(STATUS "libcoap Configuration Summary:")
+message(STATUS "")
 message(STATUS "PACKAGE VERSION..................${PACKAGE_VERSION}")
-message(STATUS "PACKAGE BUILD....................${LIBCOAP_PACKAGE_BUILD}")
+message(STATUS "PACKAGE SOURCE...................${LIBCOAP_PACKAGE_BUILD}")
 message(STATUS "ENABLE_DTLS:.....................${ENABLE_DTLS}")
 message(STATUS "ENABLE_TCP:......................${ENABLE_TCP}")
 message(STATUS "ENABLE_IPV4:.....................${ENABLE_IPV4}")
@@ -606,6 +609,7 @@ message(STATUS "CMAKE_BUILD_TYPE:................${CMAKE_BUILD_TYPE}")
 message(STATUS "CMAKE_SYSTEM_PROCESSOR:..........${CMAKE_SYSTEM_PROCESSOR}")
 message(STATUS "CMAKE_HOST_SYSTEM_NAME:..........${CMAKE_HOST_SYSTEM_NAME}")
 message(STATUS "CMAKE_GENERATOR:.................${CMAKE_GENERATOR}")
+message(STATUS "")
 
 set(top_srcdir "${CMAKE_CURRENT_LIST_DIR}")
 set(top_builddir "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/configure.ac b/configure.ac
index 21fd1959..972796c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1117,9 +1117,15 @@ libcoap-$LIBCOAP_NAME_SUFFIX.pc:libcoap-$LIBCOAP_API_VERSION.pc.in
 
 AC_OUTPUT
 
+LIBCOAP_BUILD=`git describe --tags --dirty --always`
+if test "x$LIBCOAP_BUILD" = "x"; then
+    LIBCOAP_BUILD=$PACKAGE_VERSION
+fi
+
 AC_MSG_RESULT([
-libcoap configuration summary:
+libcoap Configuration Summary:
       libcoap package version        : "$PACKAGE_VERSION"
+      libcoap package source         : "$LIBCOAP_BUILD"
       libcoap library version        : "$LIBCOAP_SO_VERSION"
       libcoap API version            : "$LIBCOAP_API_VERSION"
       libcoap DTLS lib extn          : "$LIBCOAP_DTLS_LIB_EXTENSION_NAME"