diff --git a/man/coap.txt.in b/man/coap.txt.in
index 226d11df08..1e90c7ecff 100644
--- a/man/coap.txt.in
+++ b/man/coap.txt.in
@@ -41,7 +41,8 @@ SEE ALSO
 *coap_address*(3), *coap_async*(3), *coap_attribute*(3), *coap_block*(3),
 *coap_cache*(3), *coap_context*(3), *coap_deprecated*(3), *coap_encryption*(3),
 *coap_endpoint_client*(3), *coap_endpoint_server*(3), *coap_handler*(3),
-*coap_io*(3), *coap_keepalive*(3), *coap_logging*(3), *coap_lwip*(3),
+*coap_init*(), *coap_io*(3), *coap_keepalive*(3), *coap_locking*(3),
+*coap_logging*(3), *coap_lwip*(3),
 *coap_observe*(3), *coap_oscore*(3), *coap_pdu_access*(3), *coap_pdu_setup*(3),
 *coap_persist*(3), *coap_recovery*(3), *coap_resource*(3), *coap_session*(3),
 *coap_string*(3), *coap_tls_library*(3), *coap_uri*(3) and *coap_websockets*(3)
diff --git a/man/coap_address.txt.in b/man/coap_address.txt.in
index 8ae52f37eb..d4518238ac 100644
--- a/man/coap_address.txt.in
+++ b/man/coap_address.txt.in
@@ -72,8 +72,8 @@ const uint8_t *_host_, size_t _host_len_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_async.txt.in b/man/coap_async.txt.in
index 0406d66791..b7cc29f011 100644
--- a/man/coap_async.txt.in
+++ b/man/coap_async.txt.in
@@ -45,8 +45,8 @@ coap_bin_const_t _token_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_attribute.txt.in b/man/coap_attribute.txt.in
index e01ef78ba6..d25070eb17 100644
--- a/man/coap_attribute.txt.in
+++ b/man/coap_attribute.txt.in
@@ -30,8 +30,8 @@ coap_str_const_t *_name_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_block.txt.in b/man/coap_block.txt.in
index 094be84fd6..4eb78d0ecc 100644
--- a/man/coap_block.txt.in
+++ b/man/coap_block.txt.in
@@ -50,8 +50,8 @@ size_t _length_, const uint8_t *_data_, size_t _offset_, size_t _total_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_cache.txt.in b/man/coap_cache.txt.in
index 20a7d58252..3ddc124cf3 100644
--- a/man/coap_cache.txt.in
+++ b/man/coap_cache.txt.in
@@ -63,8 +63,8 @@ coap_cache_app_data_free_callback_t _callback_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_context.txt.in b/man/coap_context.txt.in
index d0c04dbd53..0ca95d48aa 100644
--- a/man/coap_context.txt.in
+++ b/man/coap_context.txt.in
@@ -60,8 +60,8 @@ size_t _max_token_size_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_deprecated.txt.in b/man/coap_deprecated.txt.in
index e0475d506d..4bd867bcb0 100644
--- a/man/coap_deprecated.txt.in
+++ b/man/coap_deprecated.txt.in
@@ -73,8 +73,8 @@ unsigned int _max_sockets_, unsigned int *_num_sockets_, coap_tick_t _now_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
@@ -94,14 +94,13 @@ The *coap_clear_event_handler*() function is replaced by
 
 *Function: coap_context_get_csm_timeout()*
 
-The *coap_context_get_csm_timeout*() function returns the seconds to wait for
-a (TCP) CSM negotiation response from the peer for _context_,
+The *coap_context_get_csm_timeout*() function is replaced by
+*coap_context_get_csm_timeout_ms*(3) returning milli-secs instead of seconds.
 
 *Function: coap_context_set_csm_timeout()*
 
-The *coap_context_set_csm_timeout*() function sets the number of seconds to
-wait for a (TCP) CSM negotiation response from the peer to _csm_timeout_ for
-_context_.  The default is 30 secionds.  0 (the default) means wait forever.
+The *coap_context_set_csm_timeout*() function is replaced by
+*coap_context_set_csm_timeout_ms*(3) by defining milli-secs instead of seconds.
 
 *Function: coap_context_set_psk()*
 
diff --git a/man/coap_encryption.txt.in b/man/coap_encryption.txt.in
index 2b3e37580d..70940ffb4d 100644
--- a/man/coap_encryption.txt.in
+++ b/man/coap_encryption.txt.in
@@ -28,8 +28,8 @@ SYNOPSIS
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_endpoint_client.txt.in b/man/coap_endpoint_client.txt.in
index 591b5661d2..f078c7d6a5 100644
--- a/man/coap_endpoint_client.txt.in
+++ b/man/coap_endpoint_client.txt.in
@@ -40,8 +40,8 @@ _proto_, coap_dtls_pki_t *_setup_data_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_endpoint_server.txt.in b/man/coap_endpoint_server.txt.in
index bb9752fb3a..d277ced1cc 100644
--- a/man/coap_endpoint_server.txt.in
+++ b/man/coap_endpoint_server.txt.in
@@ -49,8 +49,8 @@ const char *_groupname_, const char *_ifname_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_handler.txt.in b/man/coap_handler.txt.in
index 0e1443c997..03140c1bbf 100644
--- a/man/coap_handler.txt.in
+++ b/man/coap_handler.txt.in
@@ -43,8 +43,8 @@ coap_event_handler_t _handler_)*;
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_init.txt.in b/man/coap_init.txt.in
index 45a66bde6b..9b8a9c4a79 100644
--- a/man/coap_init.txt.in
+++ b/man/coap_init.txt.in
@@ -25,8 +25,8 @@ SYNOPSIS
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_io.txt.in b/man/coap_io.txt.in
index f69cc6dbee..cc65d51ddd 100644
--- a/man/coap_io.txt.in
+++ b/man/coap_io.txt.in
@@ -52,8 +52,8 @@ size_t _nevents_)*;
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_keepalive.txt.in b/man/coap_keepalive.txt.in
index 0dc502ed7c..1bf5dbc77b 100644
--- a/man/coap_keepalive.txt.in
+++ b/man/coap_keepalive.txt.in
@@ -23,8 +23,8 @@ unsigned int _seconds_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_locking.txt.in b/man/coap_locking.txt.in
index 08256e2001..c4b0014ed8 100644
--- a/man/coap_locking.txt.in
+++ b/man/coap_locking.txt.in
@@ -47,8 +47,8 @@ coap_code_t _failed_statement_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_logging.txt.in b/man/coap_logging.txt.in
index 440189c828..9d77fbdc7c 100644
--- a/man/coap_logging.txt.in
+++ b/man/coap_logging.txt.in
@@ -99,8 +99,8 @@ char *_buffer_, size_t _length_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_observe.txt.in b/man/coap_observe.txt.in
index d8d296009d..1964310acd 100644
--- a/man/coap_observe.txt.in
+++ b/man/coap_observe.txt.in
@@ -34,8 +34,8 @@ coap_pdu_type_t _message_type_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_oscore.txt.in b/man/coap_oscore.txt.in
index 26f2ef9fc1..36b273a1f4 100644
--- a/man/coap_oscore.txt.in
+++ b/man/coap_oscore.txt.in
@@ -59,8 +59,8 @@ coap_oscore_conf_t *_oscore_conf_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_pdu_access.txt.in b/man/coap_pdu_access.txt.in
index 89ecbc8682..3e6da38595 100644
--- a/man/coap_pdu_access.txt.in
+++ b/man/coap_pdu_access.txt.in
@@ -76,8 +76,8 @@ coap_opt_iterator_t *_oi_, const coap_opt_filter_t *_filter_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_pdu_setup.txt.in b/man/coap_pdu_setup.txt.in
index 681a4c478f..c78d17be5e 100644
--- a/man/coap_pdu_setup.txt.in
+++ b/man/coap_pdu_setup.txt.in
@@ -96,8 +96,8 @@ uint8_t *_buffer_, size_t *_buflen_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_persist.txt.in b/man/coap_persist.txt.in
index 7c1df2a76e..81d80c8666 100644
--- a/man/coap_persist.txt.in
+++ b/man/coap_persist.txt.in
@@ -45,8 +45,8 @@ uint32_t _start_observe_no_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_recovery.txt.in b/man/coap_recovery.txt.in
index e458c3c10b..cdac65ff63 100644
--- a/man/coap_recovery.txt.in
+++ b/man/coap_recovery.txt.in
@@ -96,8 +96,8 @@ uint32_t _value_)*;
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_resource.txt.in b/man/coap_resource.txt.in
index 000aebfa5f..4d97c5a8c4 100644
--- a/man/coap_resource.txt.in
+++ b/man/coap_resource.txt.in
@@ -64,8 +64,8 @@ coap_resource_release_userdata_handler_t _callback_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_session.txt.in b/man/coap_session.txt.in
index 41add06391..c0312c404e 100644
--- a/man/coap_session.txt.in
+++ b/man/coap_session.txt.in
@@ -76,8 +76,8 @@ const coap_session_t *_session_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_string.txt.in b/man/coap_string.txt.in
index 9870f92773..a6e4cd4442 100644
--- a/man/coap_string.txt.in
+++ b/man/coap_string.txt.in
@@ -55,8 +55,8 @@ SYNOPSIS
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_tls_library.txt.in b/man/coap_tls_library.txt.in
index 5a86a656d7..af20f9d487 100644
--- a/man/coap_tls_library.txt.in
+++ b/man/coap_tls_library.txt.in
@@ -52,8 +52,8 @@ SYNOPSIS
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.
 
diff --git a/man/coap_uri.txt.in b/man/coap_uri.txt.in
index eb9efbf91c..99e829315a 100644
--- a/man/coap_uri.txt.in
+++ b/man/coap_uri.txt.in
@@ -41,8 +41,8 @@ int _create_port_host_opt_, uint8_t *_buf_, size_t _buflen_);*
 
 For specific (D)TLS library support, link with
 *-lcoap-@LIBCOAP_API_VERSION@-notls*, *-lcoap-@LIBCOAP_API_VERSION@-gnutls*,
-*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*
-*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*,
+*-lcoap-@LIBCOAP_API_VERSION@-openssl*, *-lcoap-@LIBCOAP_API_VERSION@-mbedtls*,
+*-lcoap-@LIBCOAP_API_VERSION@-wolfssl*
 or *-lcoap-@LIBCOAP_API_VERSION@-tinydtls*.   Otherwise, link with
 *-lcoap-@LIBCOAP_API_VERSION@* to get the default (D)TLS library support.