diff --git a/attributemap/name2oid.php b/attributemap/name2oid.php
index 8eb8010b578eb736f82ab8ef403b47c043e77572..a7cbe3410774d35d46c6a8bcbebaba3ed2f1f6a7 100644
--- a/attributemap/name2oid.php
+++ b/attributemap/name2oid.php
@@ -55,6 +55,7 @@ $attributemap = array(
     'eduPersonScopedAffiliation'    => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.9',
     'eduPersonTargetedID'           => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.10',
     'eduPersonUniqueId'             => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.13',
+    'eduPersonOrcid'                => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.16',
     'email'                         => 'urn:oid:1.2.840.113549.1.9.1',
     'emailAddress'                  => 'urn:oid:1.2.840.113549.1.9.1',
     'employeeNumber'                => 'urn:oid:2.16.840.1.113730.3.1.3',
diff --git a/attributemap/oid2name.php b/attributemap/oid2name.php
index 57c533162f17b054502451995706b1e3c812566c..735fbdfa14cdf04233b826e4f9e9a5ae13c7859c 100644
--- a/attributemap/oid2name.php
+++ b/attributemap/oid2name.php
@@ -67,6 +67,7 @@ $attributemap = array(
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.11'  => 'eduPersonAssurance',
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.10'  => 'eduPersonTargetedID',
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.13'  => 'eduPersonUniqueId',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.16'  => 'eduPersonOrcid',
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.2'   => 'eduPersonNickname',
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.3'   => 'eduPersonOrgDN',
     'urn:oid:1.3.6.1.4.1.5923.1.1.1.4'   => 'eduPersonOrgUnitDN',
diff --git a/dictionaries/attributes.definition.json b/dictionaries/attributes.definition.json
index e462c65a2896f5303d611e57b638b975f5e636a2..c04dcfc27d2ef427ea6351e32b451bc48a2f9c79 100644
--- a/dictionaries/attributes.definition.json
+++ b/dictionaries/attributes.definition.json
@@ -53,6 +53,9 @@
 	"attribute_edupersonuniqueid": {
 		"en": "Person's non-reassignable, persistent pseudonymous ID at home organization"
 	},
+	"attribute_edupersonorcid": {
+		"en": "ORCID researcher identifiers"
+	},
 	"attribute_o": {
 		"en": "Organization name"
 	},
diff --git a/dictionaries/attributes.translation.json b/dictionaries/attributes.translation.json
index 86a83e5ea74d50f30c43dbef8a0d4af711bdc11b..9379b1ec037fae22804f7ea1fdb36f03e8ffa5ab 100644
--- a/dictionaries/attributes.translation.json
+++ b/dictionaries/attributes.translation.json
@@ -608,6 +608,9 @@
 	"attribute_edupersonuniqueid": {
 		"el": "\u039c\u03cc\u03bd\u03b9\u03bc\u03bf, \u03b1\u03b4\u03b9\u03b1\u03c6\u03b1\u03bd\u03ad\u03c2 \u03b1\u03bd\u03b1\u03b3\u03bd\u03c9\u03c1\u03b9\u03c3\u03c4\u03b9\u03ba\u03cc \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7 \u03c3\u03c4\u03bf\u03bd \u03bf\u03b9\u03ba\u03b5\u03af\u03bf \u03bf\u03c1\u03b3\u03b1\u03bd\u03b9\u03c3\u03bc\u03cc"
 	},
+	"attribute_edupersonorcid": {
+		"el": "\u0391\u03bd\u03b1\u03b3\u03bd\u03c9\u03c1\u03b9\u03c3\u03c4\u03b9\u03ba\u03ac \u03b5\u03c1\u03b5\u03c5\u03bd\u03b7\u03c4\u03ae ORCID"
+	},
 	"attribute_o": {
 		"no": "Navn p\u00e5 organisasjon",
 		"nn": "Namn p\u00e5 organisasjon",