diff --git a/library/oid.c b/library/oid.c
index 2de7806..3f7857d 100644
--- a/library/oid.c
+++ b/library/oid.c
@@ -313,7 +313,7 @@
 #endif /* POLARSSL_MD_C */
 
 /*
- * For PublicKeyInfo
+ * For PublicKeyInfo (PKCS1, RFC 5480)
  */
 typedef struct {
     oid_descriptor_t    descriptor;
@@ -327,6 +327,14 @@
         POLARSSL_PK_RSA,
     },
     {
+        { OID_EC_ALG_UNRESTRICTED,  "id-ecPublicKey",   "Generic EC key" },
+        POLARSSL_PK_ECKEY,
+    },
+    {
+        { OID_EC_ALG_ECDH,          "id-ecDH",          "EC key for ECDH" },
+        POLARSSL_PK_ECKEY_DH,
+    },
+    {
         { NULL, NULL, NULL },
         0,
     },