diff --git a/include/mbedtls/chacha20.h b/include/mbedtls/chacha20.h
index d7a0750c2..47bd7d38b 100644
--- a/include/mbedtls/chacha20.h
+++ b/include/mbedtls/chacha20.h
@@ -139,7 +139,7 @@ int mbedtls_chacha20_starts( mbedtls_chacha20_context* ctx,
  *                  \c mbedtls_chacha20_starts() must be called at least once
  *                  to setup the context before this function can be called.
  *
- * \note            This function can be called mutliple times in a row in
+ * \note            This function can be called multiple times in a row in
  *                  order to encrypt of decrypt data piecewise with the same
  *                  key and nonce.
  *
diff --git a/include/mbedtls/chachapoly.h b/include/mbedtls/chachapoly.h
index 649749a01..42b2b230c 100644
--- a/include/mbedtls/chachapoly.h
+++ b/include/mbedtls/chachapoly.h
@@ -175,7 +175,7 @@ int mbedtls_chachapoly_starts( mbedtls_chachapoly_context *ctx,
  *                  The Additional Authenticated Data (AAD), also called
  *                  Associated Data (AD) is only authenticated but not
  *                  encrypted nor included in the encrypted output. It is
- *                  usually transmitted separately fro mthe ciphertext or
+ *                  usually transmitted separately from the ciphertext or
  *                  computed locally by each party.
  *
  * \note            This function is called before data is encrypted/decrypted.
diff --git a/include/mbedtls/poly1305.h b/include/mbedtls/poly1305.h
index 5c69a813a..54b50abc2 100644
--- a/include/mbedtls/poly1305.h
+++ b/include/mbedtls/poly1305.h
@@ -1,7 +1,7 @@
 /**
  * \file poly1305.h
  *
- * \brief   This file containts Poly1305 definitions and functions.
+ * \brief   This file contains Poly1305 definitions and functions.
  *
  *          Poly1305 is a one-time message authenticator that can be used to
  *          authenticate messages. Poly1305-AES was created by Daniel
@@ -109,9 +109,9 @@ int mbedtls_poly1305_starts( mbedtls_poly1305_context *ctx,
  * \brief           This functions feeds an input buffer into an ongoing
  *                  Poly1305 computation.
  *
- *                  It is called between \c mbedtls_cipher_cmac_starts() and
- *                  \c mbedtls_cipher_cmac_finish().
- *                  Can be called repeatedly to process a stream of data.
+ *                  It is called between \c mbedtls_cipher_poly1305_starts() and
+ *                  \c mbedtls_cipher_poly1305_finish().
+ *                  It can be called repeatedly to process a stream of data.
  *
  * \param ctx       The Poly1305 context to use for the Poly1305 operation.
  * \param ilen      The length of the input data (in bytes). Any value is accepted.
diff --git a/library/chachapoly.c b/library/chachapoly.c
index 80c1ebf8f..860f87765 100644
--- a/library/chachapoly.c
+++ b/library/chachapoly.c
@@ -187,7 +187,7 @@ int mbedtls_chachapoly_update_aad( mbedtls_chachapoly_context *ctx,
     }
     else if( ctx->state != CHACHAPOLY_STATE_AAD )
     {
-        return(MBEDTLS_ERR_CHACHAPOLY_BAD_STATE );
+        return( MBEDTLS_ERR_CHACHAPOLY_BAD_STATE );
     }
 
     ctx->aad_len += aad_len;