diff --git a/nselib/data/ssl-ciphers b/nselib/data/ssl-ciphers
index 652048a83..5d653ec24 100644
--- a/nselib/data/ssl-ciphers
+++ b/nselib/data/ssl-ciphers
@@ -361,5 +361,8 @@ TLS_PSK_WITH_AES_128_CCM_8                     strong
 TLS_PSK_WITH_AES_256_CCM_8                     strong
 TLS_PSK_DHE_WITH_AES_128_CCM_8                 strong
 TLS_PSK_DHE_WITH_AES_256_CCM_8                 strong
+TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256    strong
+TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256  strong
+TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256      strong
 SSL_RSA_FIPS_WITH_DES_CBC_SHA                  weak
 SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA             strong
diff --git a/scripts/ssl-enum-ciphers.nse b/scripts/ssl-enum-ciphers.nse
index daf2fcb34..87af9ecf8 100644
--- a/scripts/ssl-enum-ciphers.nse
+++ b/scripts/ssl-enum-ciphers.nse
@@ -577,6 +577,9 @@ CIPHERS = {
 ["TLS_PSK_WITH_AES_256_CCM_8"]                     =  0xC0A9,
 ["TLS_PSK_DHE_WITH_AES_128_CCM_8"]                 =  0xC0AA,
 ["TLS_PSK_DHE_WITH_AES_256_CCM_8"]                 =  0xC0AB,
+["TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"]    =  0xCC13,
+["TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"]  =  0xCC14,
+["TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"]      =  0xCC15,
 ["SSL_RSA_FIPS_WITH_DES_CBC_SHA"]                  =  0xFEFE,
 ["SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"]             =  0xFEFF,
 }