diff --git a/scripts/ssl-enum-ciphers.nse b/scripts/ssl-enum-ciphers.nse
index 88d13b5..6fc7b22 100644
--- a/scripts/ssl-enum-ciphers.nse
+++ b/scripts/ssl-enum-ciphers.nse
@@ -201,7 +201,7 @@ CIPHERS = {
 	["TLS_DH_anon_WITH_3DES_EDE_CBC_SHA"]		= 0x001B,
 	["SSL_FORTEZZA_KEA_WITH_NULL_SHA"]              = 0x001C,
 	["SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA"]      = 0x001D,
-	["TLS_KRB5_WITH_DES_CBC_SHA"]			= 0x001E,
+["TLS_KRB5_WITH_DES_CBC_SHA or SSL_FORTEZZA_KEA_WITH_RC4_128_SHA"] = 0x001E, --TLS vs SSLv3
 	["TLS_KRB5_WITH_3DES_EDE_CBC_SHA"]		= 0x001F,
 	["TLS_KRB5_WITH_RC4_128_SHA"]			= 0x0020,
 	["TLS_KRB5_WITH_IDEA_CBC_SHA"]			= 0x0021,
@@ -242,6 +242,28 @@ CIPHERS = {
 	["TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA"]	= 0x0044,
 	["TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"]	= 0x0045,
 	["TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA"]	= 0x0046,
+["TLS_ECDH_ECDSA_WITH_NULL_SHA-draft"]             =  0x0047,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_ECDSA_WITH_RC4_128_SHA-draft"]          =  0x0048,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_ECDSA_WITH_DES_CBC_SHA-draft"]          =  0x0049,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA-draft"]     =  0x004A,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA-draft"]      =  0x004B,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA-draft"]      =  0x004C,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_ECNRA_WITH_DES_CBC_SHA-draft"]          =  0x004D,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_ECNRA_WITH_3DES_EDE_CBC_SHA-draft"]     =  0x004E,  --draft-ietf-tls-ecc-00
+["TLS_ECMQV_ECDSA_NULL_SHA-draft"]                 =  0x004F,  --draft-ietf-tls-ecc-00
+["TLS_ECMQV_ECDSA_WITH_RC4_128_SHA-draft"]         =  0x0050,  --draft-ietf-tls-ecc-00
+["TLS_ECMQV_ECDSA_WITH_DES_CBC_SHA-draft"]         =  0x0051,  --draft-ietf-tls-ecc-00
+["TLS_ECMQV_ECDSA_WITH_3DES_EDE_CBC_SHA-draft"]    =  0x0052,  --draft-ietf-tls-ecc-00
+["TLS_ECMQV_ECNRA_NULL_SHA-draft"]                 =  0x0053,  --draft-ietf-tls-ecc-00
+["TLS_ECMQV_ECNRA_WITH_RC4_128_SHA-draft"]         =  0x0054,  --draft-ietf-tls-ecc-00
+["TLS_ECMQV_ECNRA_WITH_DES_CBC_SHA-draft"]         =  0x0055,  --draft-ietf-tls-ecc-00
+["TLS_ECMQV_ECNRA_WITH_3DES_EDE_CBC_SHA-draft"]    =  0x0056,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_anon_NULL_WITH_SHA-draft"]              =  0x0057,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_anon_WITH_RC4_128_SHA-draft"]           =  0x0058,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_anon_WITH_DES_CBC_SHA-draft"]           =  0x0059,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA-draft"]      =  0x005A,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_anon_EXPORT_WITH_DES40_CBC_SHA-draft"]  =  0x005B,  --draft-ietf-tls-ecc-00
+["TLS_ECDH_anon_EXPORT_WITH_RC4_40_SHA-draft"]     =  0x005C,  --draft-ietf-tls-ecc-00
 	["TLS_RSA_EXPORT1024_WITH_RC4_56_MD5"]		= 0x0060,
 	["TLS_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5"]	= 0x0061,
 	["TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA"]		= 0x0062,
@@ -256,6 +278,19 @@ CIPHERS = {
 	["TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"]		= 0x006B,
 	["TLS_DH_anon_WITH_AES_128_CBC_SHA256"]		= 0x006C,
 	["TLS_DH_anon_WITH_AES_256_CBC_SHA256"]		= 0x006D,
+["TLS_DHE_DSS_WITH_3DES_EDE_CBC_RMD"]       =  0x0072,  --draft-ietf-tls-openpgp-keys-05
+["TLS_DHE_DSS_WITH_AES_128_CBC_RMD"]        =  0x0073,  --draft-ietf-tls-openpgp-keys-05
+["TLS_DHE_DSS_WITH_AES_256_CBC_RMD"]        =  0x0074,  --draft-ietf-tls-openpgp-keys-05
+["TLS_DHE_RSA_WITH_3DES_EDE_CBC_RMD"]       =  0x0077,  --draft-ietf-tls-openpgp-keys-05
+["TLS_DHE_RSA_WITH_AES_128_CBC_RMD"]        =  0x0078,  --draft-ietf-tls-openpgp-keys-05
+["TLS_DHE_RSA_WITH_AES_256_CBC_RMD"]        =  0x0079,  --draft-ietf-tls-openpgp-keys-05
+["TLS_RSA_WITH_3DES_EDE_CBC_RMD"]           =  0x007C,  --draft-ietf-tls-openpgp-keys-05
+["TLS_RSA_WITH_AES_128_CBC_RMD"]            =  0x007D,  --draft-ietf-tls-openpgp-keys-05
+["TLS_RSA_WITH_AES_256_CBC_RMD"]            =  0x007E,  --draft-ietf-tls-openpgp-keys-05
+["TLS_GOSTR341094_WITH_28147_CNT_IMIT"]     =  0x0080,  --draft-chudov-cryptopro-cptls-04
+["TLS_GOSTR341001_WITH_28147_CNT_IMIT"]     =  0x0081,  --draft-chudov-cryptopro-cptls-04
+["TLS_GOSTR341094_WITH_NULL_GOSTR3411"]     =  0x0082,  --draft-chudov-cryptopro-cptls-04
+["TLS_GOSTR341001_WITH_NULL_GOSTR3411"]     =  0x0083,  --draft-chudov-cryptopro-cptls-04
 	["TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"]		= 0x0084,
 	["TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA"]	= 0x0085,
 	["TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA"]	= 0x0086,
@@ -322,7 +357,6 @@ CIPHERS = {
 	["TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256"]    = 0x00C3,
 	["TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256"]    = 0x00C4,
 	["TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256"]    = 0x00C5,
-	["TLS_RENEGO_PROTECTION_REQUEST"]		= 0x00FF,
 	["TLS_ECDH_ECDSA_WITH_NULL_SHA"]		= 0xC001,
 	["TLS_ECDH_ECDSA_WITH_RC4_128_SHA"]		= 0xC002,
 	["TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"]	= 0xC003,
@@ -382,8 +416,120 @@ CIPHERS = {
 	["TLS_ECDHE_PSK_WITH_NULL_SHA"]			= 0xC039,
 	["TLS_ECDHE_PSK_WITH_NULL_SHA256"]		= 0xC03A,
 	["TLS_ECDHE_PSK_WITH_NULL_SHA384"]		= 0xC03B,
+["TLS_RSA_WITH_ARIA_128_CBC_SHA256"]               =  0xC03C,
+["TLS_RSA_WITH_ARIA_256_CBC_SHA384"]               =  0xC03D,
+["TLS_DH_DSS_WITH_ARIA_128_CBC_SHA256"]            =  0xC03E,
+["TLS_DH_DSS_WITH_ARIA_256_CBC_SHA384"]            =  0xC03F,
+["TLS_DH_RSA_WITH_ARIA_128_CBC_SHA256"]            =  0xC040,
+["TLS_DH_RSA_WITH_ARIA_256_CBC_SHA384"]            =  0xC041,
+["TLS_DHE_DSS_WITH_ARIA_128_CBC_SHA256"]           =  0xC042,
+["TLS_DHE_DSS_WITH_ARIA_256_CBC_SHA384"]           =  0xC043,
+["TLS_DHE_RSA_WITH_ARIA_128_CBC_SHA256"]           =  0xC044,
+["TLS_DHE_RSA_WITH_ARIA_256_CBC_SHA384"]           =  0xC045,
+["TLS_DH_anon_WITH_ARIA_128_CBC_SHA256"]           =  0xC046,
+["TLS_DH_anon_WITH_ARIA_256_CBC_SHA384"]           =  0xC047,
+["TLS_ECDHE_ECDSA_WITH_ARIA_128_CBC_SHA256"]       =  0xC048,
+["TLS_ECDHE_ECDSA_WITH_ARIA_256_CBC_SHA384"]       =  0xC049,
+["TLS_ECDH_ECDSA_WITH_ARIA_128_CBC_SHA256"]        =  0xC04A,
+["TLS_ECDH_ECDSA_WITH_ARIA_256_CBC_SHA384"]        =  0xC04B,
+["TLS_ECDHE_RSA_WITH_ARIA_128_CBC_SHA256"]         =  0xC04C,
+["TLS_ECDHE_RSA_WITH_ARIA_256_CBC_SHA384"]         =  0xC04D,
+["TLS_ECDH_RSA_WITH_ARIA_128_CBC_SHA256"]          =  0xC04E,
+["TLS_ECDH_RSA_WITH_ARIA_256_CBC_SHA384"]          =  0xC04F,
+["TLS_RSA_WITH_ARIA_128_GCM_SHA256"]               =  0xC050,
+["TLS_RSA_WITH_ARIA_256_GCM_SHA384"]               =  0xC051,
+["TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256"]           =  0xC052,
+["TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384"]           =  0xC053,
+["TLS_DH_RSA_WITH_ARIA_128_GCM_SHA256"]            =  0xC054,
+["TLS_DH_RSA_WITH_ARIA_256_GCM_SHA384"]            =  0xC055,
+["TLS_DHE_DSS_WITH_ARIA_128_GCM_SHA256"]           =  0xC056,
+["TLS_DHE_DSS_WITH_ARIA_256_GCM_SHA384"]           =  0xC057,
+["TLS_DH_DSS_WITH_ARIA_128_GCM_SHA256"]            =  0xC058,
+["TLS_DH_DSS_WITH_ARIA_256_GCM_SHA384"]            =  0xC059,
+["TLS_DH_anon_WITH_ARIA_128_GCM_SHA256"]           =  0xC05A,
+["TLS_DH_anon_WITH_ARIA_256_GCM_SHA384"]           =  0xC05B,
+["TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256"]       =  0xC05C,
+["TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384"]       =  0xC05D,
+["TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256"]        =  0xC05E,
+["TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384"]        =  0xC05F,
+["TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256"]         =  0xC060,
+["TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384"]         =  0xC061,
+["TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256"]          =  0xC062,
+["TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384"]          =  0xC063,
+["TLS_PSK_WITH_ARIA_128_CBC_SHA256"]               =  0xC064,
+["TLS_PSK_WITH_ARIA_256_CBC_SHA384"]               =  0xC065,
+["TLS_DHE_PSK_WITH_ARIA_128_CBC_SHA256"]           =  0xC066,
+["TLS_DHE_PSK_WITH_ARIA_256_CBC_SHA384"]           =  0xC067,
+["TLS_RSA_PSK_WITH_ARIA_128_CBC_SHA256"]           =  0xC068,
+["TLS_RSA_PSK_WITH_ARIA_256_CBC_SHA384"]           =  0xC069,
+["TLS_PSK_WITH_ARIA_128_GCM_SHA256"]               =  0xC06A,
+["TLS_PSK_WITH_ARIA_256_GCM_SHA384"]               =  0xC06B,
+["TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256"]           =  0xC06C,
+["TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384"]           =  0xC06D,
+["TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256"]           =  0xC06E,
+["TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384"]           =  0xC06F,
+["TLS_ECDHE_PSK_WITH_ARIA_128_CBC_SHA256"]         =  0xC070,
+["TLS_ECDHE_PSK_WITH_ARIA_256_CBC_SHA384"]         =  0xC071,
+["TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256"]   =  0xC072,
+["TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384"]   =  0xC073,
+["TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256"]    =  0xC074,
+["TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384"]    =  0xC075,
+["TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256"]     =  0xC076,
+["TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384"]     =  0xC077,
+["TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256"]      =  0xC078,
+["TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384"]      =  0xC079,
+["TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256"]           =  0xC07A,
+["TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384"]           =  0xC07B,
+["TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256"]       =  0xC07C,
+["TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384"]       =  0xC07D,
+["TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256"]        =  0xC07E,
+["TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384"]        =  0xC07F,
+["TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256"]       =  0xC080,
+["TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384"]       =  0xC081,
+["TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256"]        =  0xC082,
+["TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384"]        =  0xC083,
+["TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256"]       =  0xC084,
+["TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384"]       =  0xC085,
+["TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256"]   =  0xC086,
+["TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384"]   =  0xC087,
+["TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256"]    =  0xC088,
+["TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384"]    =  0xC089,
+["TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256"]     =  0xC08A,
+["TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384"]     =  0xC08B,
+["TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256"]      =  0xC08C,
+["TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384"]      =  0xC08D,
+["TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256"]           =  0xC08E,
+["TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384"]           =  0xC08F,
+["TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256"]       =  0xC090,
+["TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384"]       =  0xC091,
+["TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256"]       =  0xC092,
+["TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384"]       =  0xC093,
+["TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256"]           =  0xC094,
+["TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384"]           =  0xC095,
+["TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256"]       =  0xC096,
+["TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384"]       =  0xC097,
+["TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256"]       =  0xC098,
+["TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384"]       =  0xC099,
+["TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256"]     =  0xC09A,
+["TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384"]     =  0xC09B,
+["TLS_RSA_WITH_AES_128_CCM"]                       =  0xC09C,
+["TLS_RSA_WITH_AES_256_CCM"]                       =  0xC09D,
+["TLS_DHE_RSA_WITH_AES_128_CCM"]                   =  0xC09E,
+["TLS_DHE_RSA_WITH_AES_256_CCM"]                   =  0xC09F,
+["TLS_RSA_WITH_AES_128_CCM_8"]                     =  0xC0A0,
+["TLS_RSA_WITH_AES_256_CCM_8"]                     =  0xC0A1,
+["TLS_DHE_RSA_WITH_AES_128_CCM_8"]                 =  0xC0A2,
+["TLS_DHE_RSA_WITH_AES_256_CCM_8"]                 =  0xC0A3,
+["TLS_PSK_WITH_AES_128_CCM"]                       =  0xC0A4,
+["TLS_PSK_WITH_AES_256_CCM"]                       =  0xC0A5,
+["TLS_DHE_PSK_WITH_AES_128_CCM"]                   =  0xC0A6,
+["TLS_DHE_PSK_WITH_AES_256_CCM"]                   =  0xC0A7,
+["TLS_PSK_WITH_AES_128_CCM_8"]                     =  0xC0A8,
+["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,
 	["SSL_RSA_FIPS_WITH_DES_CBC_SHA"]		= 0xFEFE,
-	["SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"]		= 0xFEFF
+["SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"]             =  0xFEFF,
 }
 
 cipherstrength = {
