diff --git a/nselib/tls.lua b/nselib/tls.lua
index 30782ce3f..474999245 100644
--- a/nselib/tls.lua
+++ b/nselib/tls.lua
@@ -119,31 +119,41 @@ COMPRESSORS = {
 ---
 -- RFC 4492 section 5.1.1 "Supported Elliptic Curves Extension".
 ELLIPTIC_CURVES = {
-  sect163k1 = 1,
-  sect163r1 = 2,
-  sect163r2 = 3,
-  sect193r1 = 4,
-  sect193r2 = 5,
-  sect233k1 = 6,
-  sect233r1 = 7,
-  sect239k1 = 8,
-  sect283k1 = 9,
-  sect283r1 = 10,
-  sect409k1 = 11,
-  sect409r1 = 12,
-  sect571k1 = 13,
-  sect571r1 = 14,
-  secp160k1 = 15,
-  secp160r1 = 16,
-  secp160r2 = 17,
-  secp192k1 = 18,
-  secp192r1 = 19,
-  secp224k1 = 20,
-  secp224r1 = 21,
-  secp256k1 = 22,
+  sect163k1 = 1, --deprecated
+  sect163r1 = 2, --deprecated
+  sect163r2 = 3, --deprecated
+  sect193r1 = 4, --deprecated
+  sect193r2 = 5, --deprecated
+  sect233k1 = 6, --deprecated
+  sect233r1 = 7, --deprecated
+  sect239k1 = 8, --deprecated
+  sect283k1 = 9, --deprecated
+  sect283r1 = 10, --deprecated
+  sect409k1 = 11, --deprecated
+  sect409r1 = 12, --deprecated
+  sect571k1 = 13, --deprecated
+  sect571r1 = 14, --deprecated
+  secp160k1 = 15, --deprecated
+  secp160r1 = 16, --deprecated
+  secp160r2 = 17, --deprecated
+  secp192k1 = 18, --deprecated
+  secp192r1 = 19, --deprecated
+  secp224k1 = 20, --deprecated
+  secp224r1 = 21, --deprecated
+  secp256k1 = 22, --deprecated
   secp256r1 = 23,
   secp384r1 = 24,
   secp521r1 = 25,
+  brainpoolP256r1 = 26, --RFC7027
+  brainpoolP384r1 = 27,
+  brainpoolP512r1 = 28,
+  ecdh_x25519 = 29, -- draft rfc4492
+  ecdh_x448 = 30, --draft rfc4492
+  ffdhe2048 = 256, --RFC7919
+  ffdhe3072 = 257, --RFC7919
+  ffdhe4096 = 258, --RFC7919
+  ffdhe6144 = 259, --RFC7919
+  ffdhe8192 = 260, --RFC7919
   arbitrary_explicit_prime_curves = 0xFF01,
   arbitrary_explicit_char2_curves = 0xFF02,
 }
@@ -609,9 +619,20 @@ 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,
+["TLS_ECDHE_ECDSA_WITH_AES_128_CCM"]               =  0xC0AC,
+["TLS_ECDHE_ECDSA_WITH_AES_256_CCM"]               =  0xC0AD,
+["TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8"]             =  0xC0AE,
+["TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8"]             =  0xC0AF,
+["TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256-draft"]    =  0xCC13, -- RFC7905 superseded
+["TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256-draft"]  =  0xCC14, -- RFC7905 superseded
+["TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256-draft"]      =  0xCC15, -- RFC7905 superseded
+["TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"]    =  0xCCA8,
+["TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"]  =  0xCCA9,
+["TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"]      =  0xCCAA,
+["TLS_PSK_WITH_CHACHA20_POLY1305_SHA256"]          =  0xCCAB,
+["TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"]    =  0xCCAC,
+["TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256"]      =  0xCCAD,
+["TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256"]      =  0xCCAE,
 ["SSL_RSA_FIPS_WITH_DES_CBC_SHA"]                  =  0xFEFE,
 ["SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"]             =  0xFEFF,
 }