diff --git a/ChangeLog b/ChangeLog
index 13de8672c7..5d43296db4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
+= mbed TLS x.x.x branch released xxxx-xx-xx
+
+Changes
+   * Add hardware acceleration support for cmac, with the configuration definition
+     of `MBEDTLS_CMAC_ALT`. Submitted by stevew817
+
 = mbed TLS 2.4.2 branch released 2017-03-08
 
 Security
diff --git a/library/cmac.c b/library/cmac.c
index 5575d5c8d7..d3581d589c 100644
--- a/library/cmac.c
+++ b/library/cmac.c
@@ -65,7 +65,7 @@
 #endif /* MBEDTLS_SELF_TEST */
 #endif /* MBEDTLS_PLATFORM_C */
 
-#if !defined(MBEDTLS_CMAC_ALT)
+#if !defined(MBEDTLS_CMAC_ALT) || defined(MBEDTLS_SELF_TEST)
 
 /* Implementation that should never be optimized out by the compiler */
 static void mbedtls_zeroize( void *v, size_t n ) {
@@ -166,7 +166,9 @@ exit:
 
     return( ret );
 }
+#endif /* !defined(MBEDTLS_CMAC_ALT) || defined(MBEDTLS_SELF_TEST) */
 
+#if !defined(MBEDTLS_CMAC_ALT)
 static void cmac_xor_block( unsigned char *output, const unsigned char *input1,
                             const unsigned char *input2,
                             const size_t block_size )