diff --git a/include/mbedtls/x509_crt.h b/include/mbedtls/x509_crt.h
index b321c42..81a2de2 100644
--- a/include/mbedtls/x509_crt.h
+++ b/include/mbedtls/x509_crt.h
@@ -121,7 +121,12 @@
          *                         hwType OBJECT IDENTIFIER,
          *                         hwSerialNum OCTET STRING }
          */
-        mbedtls_x509_name hardware_module_name;
+        struct
+        {
+            mbedtls_x509_buf oid;               /**< The object identifier. */
+            mbedtls_x509_buf val;               /**< The named value. */
+        }
+        hardware_module_name;
     }
     value;
 }