diff --git a/security/jss/org/mozilla/jss/pkcs11/KeyType.java b/security/jss/org/mozilla/jss/pkcs11/KeyType.java
index ab28bbec329..d926ad3656d 100644
--- a/security/jss/org/mozilla/jss/pkcs11/KeyType.java
+++ b/security/jss/org/mozilla/jss/pkcs11/KeyType.java
@@ -189,6 +189,24 @@ final class KeyType {
                             EncryptionAlgorithm.DES3_CBC,
                             EncryptionAlgorithm.DES3_CBC_PAD
                             },
+                            "DESede"
+                        );
+
+    //////////////////////////////////////////////////////////////
+    static public final KeyType
+    AES       = new KeyType(new Algorithm[]
+                            {
+                            KeyWrapAlgorithm.AES_ECB,
+                            KeyWrapAlgorithm.AES_CBC,
+                            KeyWrapAlgorithm.AES_CBC_PAD,
+                            EncryptionAlgorithm.AES_128_ECB,
+                            EncryptionAlgorithm.AES_128_CBC,
+                            EncryptionAlgorithm.AES_192_ECB,
+                            EncryptionAlgorithm.AES_192_CBC,
+                            EncryptionAlgorithm.AES_256_ECB,
+                            EncryptionAlgorithm.AES_256_CBC,
+                            EncryptionAlgorithm.AES_CBC_PAD,
+                            },
                             "DES"
                         );
 
diff --git a/security/jss/org/mozilla/jss/util/java_ids.h b/security/jss/org/mozilla/jss/util/java_ids.h
index a649ea2682e..14054baa36c 100644
--- a/security/jss/org/mozilla/jss/util/java_ids.h
+++ b/security/jss/org/mozilla/jss/util/java_ids.h
@@ -114,6 +114,7 @@ PR_BEGIN_EXTERN_C
 #define RC4_KEYTYPE_FIELD "RC4"
 #define RC2_KEYTYPE_FIELD "RC2"
 #define SHA1_HMAC_KEYTYPE_FIELD "SHA1_HMAC"
+#define AES_KEYTYPE_FIELD "AES"
 
 /*
  * NativeProxy