diff --git a/include/mbedtls/error.h b/include/mbedtls/error.h
index 6e3905d86..5e549f6b6 100644
--- a/include/mbedtls/error.h
+++ b/include/mbedtls/error.h
@@ -66,7 +66,6 @@
  * PBKDF2    1  0x007C-0x007C
  * HMAC_DRBG 4  0x0003-0x0009
  * CCM       2                  0x000D-0x000F
- * CMAC      3                  0x0011-0x0015
  *
  * High-level module nr (3 bits - 0x0...-0x7...)
  * Name      ID  Nr of Errors
diff --git a/scripts/generate_errors.pl b/scripts/generate_errors.pl
index dd91151d6..cfcf07c8f 100755
--- a/scripts/generate_errors.pl
+++ b/scripts/generate_errors.pl
@@ -33,7 +33,7 @@ my @low_level_modules = ( "AES", "ASN1", "BLOWFISH", "CAMELLIA", "BIGNUM",
                           "BASE64", "XTEA", "PBKDF2", "OID",
                           "PADLOCK", "DES", "NET", "CTR_DRBG", "ENTROPY",
                           "HMAC_DRBG", "MD2", "MD4", "MD5", "RIPEMD160",
-                          "SHA1", "SHA256", "SHA512", "GCM", "THREADING", "CCM", "CMAC" );
+                          "SHA1", "SHA256", "SHA512", "GCM", "THREADING", "CCM" );
 my @high_level_modules = ( "PEM", "X509", "DHM", "RSA", "ECP", "MD", "CIPHER", "SSL",
                            "PK", "PKCS12", "PKCS5" );