diff --git a/mozilla/security/jss/org/mozilla/jss/crypto/PrivateKey.java b/mozilla/security/jss/org/mozilla/jss/crypto/PrivateKey.java
index c297df2e689..9b63a623b34 100644
--- a/mozilla/security/jss/org/mozilla/jss/crypto/PrivateKey.java
+++ b/mozilla/security/jss/org/mozilla/jss/crypto/PrivateKey.java
@@ -58,6 +58,10 @@ public interface PrivateKey extends java.security.PrivateKey
      * certificates to keys.
      *
      * @see org.mozilla.jss.crypto.TokenCertificate#getUniqueID
+     * @deprecated This ID is based on an implementation that might change.
+     *      If this functionality is required, it should be provided in
+     *      another way, such as a function that directly matches a cert and
+     *      key.
      */
     public byte[] getUniqueID() throws TokenException;
 
diff --git a/mozilla/security/jss/org/mozilla/jss/crypto/TokenCertificate.java b/mozilla/security/jss/org/mozilla/jss/crypto/TokenCertificate.java
index 1430166293b..c23635d0007 100644
--- a/mozilla/security/jss/org/mozilla/jss/crypto/TokenCertificate.java
+++ b/mozilla/security/jss/org/mozilla/jss/crypto/TokenCertificate.java
@@ -46,6 +46,10 @@ public interface TokenCertificate extends X509Certificate {
      * certificates to keys.
      *
      * @see org.mozilla.jss.crypto.PrivateKey#getUniqueID
+     * @deprecated This ID is based on an implementation that might change.
+     *      If this functionality is required, it should be provided in
+     *      another way, such as a function that directly matches a cert and
+     *      key.
      */
     public abstract byte[] getUniqueID();