diff --git a/epan/dissectors/asn1/x509sat/x509sat.cnf b/epan/dissectors/asn1/x509sat/x509sat.cnf
index 7be97e8a46..853287d44a 100644
--- a/epan/dissectors/asn1/x509sat/x509sat.cnf
+++ b/epan/dissectors/asn1/x509sat/x509sat.cnf
@@ -183,7 +183,7 @@ DirectoryString        B "2.5.4.65"   "id-at-pseudonym"
 ObjectIdentifier       B "2.5.4.66" "id-at-communuicationsService"
 ObjectIdentifier       B "2.5.4.67" "id-at-communuicationsNetwork"
 
-ObjectIdentifier       B "2.5.4.97"   "id-at-organizationIdentifier"
+DirectoryString        B "2.5.4.97" "id-at-organizationIdentifier"
 
 SyntaxNumericString	   B "2.5.13.8" "id-mr-numericStringMatch"
 CaseIgnoreListMatch	   B "2.5.13.11" "id-mr-caseIgnoreListMatch"
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index 1a0403ec61..4f495cc3f4 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -2718,7 +2718,7 @@ void proto_reg_handoff_x509sat(void) {
   register_ber_oid_dissector("2.5.4.65", dissect_DirectoryString_PDU, proto_x509sat, "id-at-pseudonym");
   register_ber_oid_dissector("2.5.4.66", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-communuicationsService");
   register_ber_oid_dissector("2.5.4.67", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-communuicationsNetwork");
-  register_ber_oid_dissector("2.5.4.97", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-organizationIdentifier");
+  register_ber_oid_dissector("2.5.4.97", dissect_DirectoryString_PDU, proto_x509sat, "id-at-organizationIdentifier");
   register_ber_oid_dissector("2.5.13.8", dissect_SyntaxNumericString_PDU, proto_x509sat, "id-mr-numericStringMatch");
   register_ber_oid_dissector("2.5.13.11", dissect_CaseIgnoreListMatch_PDU, proto_x509sat, "id-mr-caseIgnoreListMatch");
   register_ber_oid_dissector("2.5.13.16", dissect_BitString_PDU, proto_x509sat, "id-mr-bitStringMatch");