diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 6f4e76a2..7b37d0f7 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -522,7 +522,7 @@ struct MHD_PostProcessor;
  *
  * Starting the daemon may also fail if a particular option is not
  * implemented or not supported on the target platform (i.e. no
- * support for SSL, threads or IPv6).
+ * support for TLS, epoll or IPv6).
  */
 enum MHD_FLAG
 {
@@ -1995,9 +1995,7 @@ MHD_queue_response (struct MHD_Connection *connection,
 
 /**
  * Suspend handling of network data for a given connection.  This can
- * be used to dequeue a connection from MHD's event loop (external
- * select, internal select or thread pool; not applicable to
- * thread-per-connection!) for a while.
+ * be used to dequeue a connection from MHD's event loop for a while.
  *
  * If you use this API in conjunction with a internal select or a
  * thread pool, you must set the option #MHD_USE_ITC to
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index 4f6635b4..77679aaf 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -890,8 +890,7 @@ struct MHD_Connection
 
 #ifdef UPGRADE_SUPPORT
   /**
-   * If this connection was upgraded and if we are using
-   * #MHD_USE_THREAD_PER_CONNECTION or #MHD_USE_TLS, this points to
+   * If this connection was upgraded, this points to
    * the upgrade response details such that the
    * #thread_main_connection_upgrade()-logic can perform the
    * bi-directional forwarding.