diff --git a/tests/test_piv.py b/tests/test_piv.py
index 7f5f35e3..ccb46819 100644
--- a/tests/test_piv.py
+++ b/tests/test_piv.py
@@ -21,6 +21,8 @@
         r"CN=Before\0dAfter,DC=example,DC=net",
         # r"1.3.6.1.4.1.1466.0=#04024869", - Not supported.
         r"CN=Lu\C4\8Di\C4\87",
+        (r"CN=James Smith,OU=Sales,L=Redwood Shores,O=OpenLDAP,"
+         r"ST=California,C=US,emailAddress=james.smith@openldap.org"),
     ],
 )
 def test_parse_rfc4514_string(value):
diff --git a/ykman/piv.py b/ykman/piv.py
index 5d70e995..c4e0582e 100644
--- a/ykman/piv.py
+++ b/ykman/piv.py
@@ -72,6 +72,7 @@
     "STREET": NameOID.STREET_ADDRESS,
     "DC": NameOID.DOMAIN_COMPONENT,
     "UID": NameOID.USER_ID,
+    "emailAddress": NameOID.EMAIL_ADDRESS,
 }