diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation.c b/src/libimcv/plugins/imc_attestation/imc_attestation.c
index 89735fc79..24a2044f4 100644
--- a/src/libimcv/plugins/imc_attestation/imc_attestation.c
+++ b/src/libimcv/plugins/imc_attestation/imc_attestation.c
@@ -21,16 +21,17 @@
 #include <ietf/ietf_attr_pa_tnc_error.h>
 #include <tcg/tcg_attr.h>
 
-#include <pen/pen.h>
+#include <tncif_pa_subtypes.h>
 
+#include <pen/pen.h>
 #include <debug.h>
 
 /* IMC definitions */
 
 static const char imc_name[] = "Attestation";
 
-#define IMC_VENDOR_ID	PEN_ITA
-#define IMC_SUBTYPE		0x02
+#define IMC_VENDOR_ID	PEN_TCG
+#define IMC_SUBTYPE		PA_SUBTYPE_TCG_PTS
 
 static imc_agent_t *imc_attestation;
  
diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation.c b/src/libimcv/plugins/imv_attestation/imv_attestation.c
index b594378dd..428825c92 100644
--- a/src/libimcv/plugins/imv_attestation/imv_attestation.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation.c
@@ -21,16 +21,17 @@
 #include <ietf/ietf_attr_pa_tnc_error.h>
 #include <tcg/tcg_attr.h>
 
-#include <pen/pen.h>
+#include <tncif_pa_subtypes.h>
 
+#include <pen/pen.h>
 #include <debug.h>
 
 /* IMV definitions */
 
 static const char imv_name[] = "Attestation";
 
-#define IMV_VENDOR_ID	PEN_ITA
-#define IMV_SUBTYPE		0x02
+#define IMV_VENDOR_ID	PEN_TCG
+#define IMV_SUBTYPE		PA_SUBTYPES_TCG_PTS
 
 static imv_agent_t *imv_attestation;