diff --git a/etc/mapping-rfc.txt b/etc/mapping-rfc.txt
index 2c48bbe..3a1d092 100644
--- a/etc/mapping-rfc.txt
+++ b/etc/mapping-rfc.txt
@@ -336,9 +336,16 @@ xC0AC  TLS_ECDHE_ECDSA_WITH_AES_128_CCM
 xC0AD  TLS_ECDHE_ECDSA_WITH_AES_256_CCM 
 xC0AE  TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8
 xC0AF  TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8
-xCC13  TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
-xCC14  TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
-xCC15  TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+xCCA8  TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
+xCCA9  TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
+xCCAA  TLS_DHE_RSA_WITH_CHACHA20_POLY1305
+xCCAB  TLS_PSK_WITH_CHACHA20_POLY1305
+xCCAC  TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305
+xCCAD  TLS_DHE_PSK_WITH_CHACHA20_POLY1305
+xCCAE  TLS_RSA_PSK_WITH_CHACHA20_POLY1305
+xCC13  OLD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+xCC14  OLD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
+xCC15  OLD_TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256
 xFEFE  SSL_RSA_FIPS_WITH_DES_CBC_SHA
 xFEFF  SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA
 xFFE0  SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA