diff --git a/lib/wolfTPM b/lib/wolfTPM
index fc683a1cc..a5f6c912a 160000
--- a/lib/wolfTPM
+++ b/lib/wolfTPM
@@ -1 +1 @@
-Subproject commit fc683a1cc0c0b5fa1c49639c5e302a6558593243
+Subproject commit a5f6c912ac6903872d9666238440a76bc9f92517
diff --git a/lib/wolfssl b/lib/wolfssl
index ea3a79e21..bdd62314f 160000
--- a/lib/wolfssl
+++ b/lib/wolfssl
@@ -1 +1 @@
-Subproject commit ea3a79e216c6155b773edbdb3d9d361fcd53459d
+Subproject commit bdd62314f00fca0e216bf8c963c8eeff6327e0cb
diff --git a/tools/tpm/Makefile b/tools/tpm/Makefile
index 62e09b361..4ac391ab2 100644
--- a/tools/tpm/Makefile
+++ b/tools/tpm/Makefile
@@ -14,6 +14,7 @@ WOLFDIR = $(WOLFBOOTDIR)/lib/wolfssl/
 WOLFTPMDIR = $(WOLFBOOTDIR)/lib/wolfTPM/
 CFLAGS = -Wall -Wextra -Werror
 CFLAGS += -DWOLFSSL_USER_SETTINGS -DWOLFTPM_USER_SETTINGS -DWOLFBOOT_TPM -DHAVE_NETDB_H
+CFLAGS += -DXSTRTOL=strtol
 CFLAGS += -I. -I$(WOLFDIR) -I$(WOLFTPMDIR) -I$(WOLFBOOTDIR)/include
 LDFLAGS =
 OBJDIR = ./