diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h
index 046ad0e6..9245c7f5 100644
--- a/lib/libwebsockets.h
+++ b/lib/libwebsockets.h
@@ -694,7 +694,7 @@ struct libwebsocket_protocols {
  * @per_session_data_size: 	Libwebsockets will auto-malloc this much
  * 				memory for the use of the extension, a pointer
  *				to it comes in the @user callback parameter
- * @per_context_private_data:   Optional storage for this externsion that
+ * @per_context_private_data:   Optional storage for this extension that
  * 				is per-context, so it can track stuff across
  * 				all sessions, etc, if it wants
  */
diff --git a/test-server/test-ping.c b/test-server/test-ping.c
index f83fe92a..ee390ceb 100644
--- a/test-server/test-ping.c
+++ b/test-server/test-ping.c
@@ -433,7 +433,7 @@ int main(int argc, char **argv)
 				 "origin", protocols[PROTOCOL_LWS_MIRROR].name,
 								  ietf_version);
 		if (ping_wsi[n] == NULL) {
-			fprintf(stderr, "client connnection %d failed to "
+			fprintf(stderr, "client connection %d failed to "
 								"connect\n", n);
 			return 1;
 		}