diff --git a/src/tpm2/TpmTypes.h b/src/tpm2/TpmTypes.h
index fdb5c7b9..a1e30145 100644
--- a/src/tpm2/TpmTypes.h
+++ b/src/tpm2/TpmTypes.h
@@ -80,11 +80,11 @@ typedef  UINT32             TPM_SPEC;
 #define  TPM_SPEC_FAMILY         (TPM_SPEC)(SPEC_FAMILY)
 #define  SPEC_LEVEL              00
 #define  TPM_SPEC_LEVEL          (TPM_SPEC)(SPEC_LEVEL)
-#define  SPEC_VERSION            146
+#define  SPEC_VERSION            148
 #define  TPM_SPEC_VERSION        (TPM_SPEC)(SPEC_VERSION)
-#define  SPEC_YEAR               2017
+#define  SPEC_YEAR               2018
 #define  TPM_SPEC_YEAR           (TPM_SPEC)(SPEC_YEAR)
-#define  SPEC_DAY_OF_YEAR        167
+#define  SPEC_DAY_OF_YEAR        159
 #define  TPM_SPEC_DAY_OF_YEAR    (TPM_SPEC)(SPEC_DAY_OF_YEAR)
 /* Table 2:7 - Definition of TPM_GENERATED Constants */
 typedef  UINT32             TPM_GENERATED;
diff --git a/src/tpm2/VendorString.h b/src/tpm2/VendorString.h
index c617b356..7e053452 100644
--- a/src/tpm2/VendorString.h
+++ b/src/tpm2/VendorString.h
@@ -1,9 +1,9 @@
 /********************************************************************************/
 /*										*/
-/*			     				*/
+/*			     	Vendor String					*/
 /*			     Written by Ken Goldman				*/
 /*		       IBM Thomas J. Watson Research Center			*/
-/*            $Id: VendorString.h 809 2016-11-16 18:31:54Z kgoldman $			*/
+/*            $Id: VendorString.h 1259 2018-07-10 19:11:09Z kgoldman $		*/
 /*										*/
 /*  Licenses and Notices							*/
 /*										*/
@@ -55,7 +55,7 @@
 /*    arising in any way out of use or reliance upon this specification or any 	*/
 /*    information herein.							*/
 /*										*/
-/*  (c) Copyright IBM Corp. and others, 2016					*/
+/*  (c) Copyright IBM Corp. and others, 2016 - 2018				*/
 /*										*/
 /********************************************************************************/
 
@@ -66,38 +66,44 @@
    TPM_PT_MANUFACTURER in TPM2_GetCapability(). The following line should be un-commented and a
    vendor specific string should be provided here. */
 #define    MANUFACTURER    "IBM "
+
 /*     The following #if macro may be deleted after a proper MANUFACTURER is provided. */
 #ifndef MANUFACTURER
 #error MANUFACTURER is not provided.				   \
     Please modify include\VendorString.h to provide a specific	   \
     manufacturer name.
 #endif
-/*     Define up to 4, 4-octet, vendor-specific values. The values must each be 4 octet long and the
+
+/*     Define up to 4, 4-byte, vendor-specific values. The values must each be 4 bytes long and the
        last value used may contain trailing zeros. These values define the response for
        TPM_PT_VENDOR_STRING_(1-4) in TPM2_GetCapability(). The following line should be un-commented
-       and a vendor specific string */
-/* A vendor-specific string should be provided here. */
+       and a vendor specific string.  The vendor strings 2-4 may also be defined as appropriate. */
+
 #define       VENDOR_STRING_1       "SW  "
 #define       VENDOR_STRING_2       " TPM"
-/*     The vendor strings 2-4 may also be defined as needed. */
 //#define       VENDOR_STRING_3
 //#define       VENDOR_STRING_4
+
 /*     The following #if macro may be deleted after a proper VENDOR_STRING_1 is provided. */
 #ifndef VENDOR_STRING_1
-#error VENDOR_STRING_1 is not provided.
+#error VENDOR_STRING_1 is not provided.					\
+    Please modify include\VendorString.h to provide a vendor specific	\
+    string.
 #endif
-/*     A vendor-specific FIRMWARE_V1 is required here. It is the more significant 32-bits of a
-       vendor-specific value indicating the version of the firmware */
-#define   FIRMWARE_V1         (0x20160511)
-/*     A vendor-specific FIRMWARE_V2 may be provided here. If present, it is the less significant
-       32-bits of the version of the firmware. */
-#define   FIRMWARE_V2         (0x00162800)
-/*     The following macro is just to insure that a FIRMWARE_V1 value is provided. */
+
+/* the more significant 32-bits of a vendor-specific value indicating the version of the firmware
+   The following line should be un-commented and a vendor specific firmware V1 should be provided
+   here. The FIRMWARE_V2 may also be defined as appropriate. */
+#define   FIRMWARE_V1         (0x20170619)
+
+// the less significant 32-bits of a vendor-specific value indicating the version of the firmware
+#define   FIRMWARE_V2         (0x00163636)
+
+// The following #if macro may be deleted after a proper FIRMWARE_V1 is provided.
 #ifndef FIRMWARE_V1
 #error  FIRMWARE_V1 is not provided.					\
-    Please modify include\VendorString.h to provide a vendor-specific firmware \
+    Please modify include\VendorString.h to provide a vendor specific firmware \
     version
 #endif
 
-
 #endif