diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi
index bd6da838..150dd048 100644
--- a/doc/libmicrohttpd.texi
+++ b/doc/libmicrohttpd.texi
@@ -619,7 +619,7 @@ flag is very convenient for multiplatform applications.
 Tell the TLS library to support post handshake client authentication.
 Only useful in combination with @code{MHD_USE_TLS}.
 
-This option will only work if the underyling TLS library
+This option will only work if the underlying TLS library
 supports it (i.e. GnuTLS after 3.6.3). If the TLS library
 does not support it, MHD may ignore the option and proceed
 without supporting this features.
@@ -630,7 +630,7 @@ resulting security drawbacks. Only enable this if you really know what
 you are doing. MHD currently does NOT enforce that this only affects
 GET requests! You have been warned.
 
-This option will only work if the underyling TLS library
+This option will only work if the underlying TLS library
 supports it (i.e. GnuTLS after 3.6.3). If the TLS library
 does not support it, MHD may ignore the option and proceed
 without supporting this features.
diff --git a/src/include/microhttpd2.h b/src/include/microhttpd2.h
index 7c1b5187..52e423a2 100644
--- a/src/include/microhttpd2.h
+++ b/src/include/microhttpd2.h
@@ -471,7 +471,7 @@ enum MHD_StatusCode
   MHD_SC_UPGRADE_FORWARD_INCOMPLETE = 30010,
 
   /**
-   * We failed to allocate memory for generatig the response from our
+   * We failed to allocate memory for generating the response from our
    * memory pool.  Likely the request header was too large to leave
    * enough room.
    */