diff --git a/jdk/src/share/lib/security/sunpkcs11-solaris.cfg b/jdk/src/share/lib/security/sunpkcs11-solaris.cfg
index d0b34ca134d..daf03a447a3 100644
--- a/jdk/src/share/lib/security/sunpkcs11-solaris.cfg
+++ b/jdk/src/share/lib/security/sunpkcs11-solaris.cfg
@@ -14,6 +14,8 @@ handleStartupErrors = ignoreAll
 attributes = compatibility
 
 disabledMechanisms = {
+# the following mechanisms are disabled due to lack of digest cloning support
+# need to fix 6414899 first
   CKM_MD2
   CKM_MD5
   CKM_SHA_1
@@ -21,9 +23,6 @@ disabledMechanisms = {
   CKM_SHA384
   CKM_SHA512
   CKM_DSA_KEY_PAIR_GEN
-# KEY_AND_MAC_DERIVE disabled due to Solaris bug 6306708
-  CKM_SSL3_KEY_AND_MAC_DERIVE
-  CKM_TLS_KEY_AND_MAC_DERIVE
 # the following mechanisms are disabled due to performance issues (Solaris bug 6337157)
   CKM_DSA_SHA1
   CKM_MD5_RSA_PKCS