diff --git a/crypto/external/cpl/trousers/dist/src/tspi/tsp_tcsi_param.c b/crypto/external/cpl/trousers/dist/src/tspi/tsp_tcsi_param.c
index 34c1cf36b2ac..f7c5977d745a 100644
--- a/crypto/external/cpl/trousers/dist/src/tspi/tsp_tcsi_param.c
+++ b/crypto/external/cpl/trousers/dist/src/tspi/tsp_tcsi_param.c
@@ -15,7 +15,8 @@
 
 #ifndef __APPLE__
 #include <limits.h>
-#else
+#endif
+#ifndef HOST_NAME_MAX
 #define HOST_NAME_MAX 64
 #endif
 
@@ -99,7 +100,7 @@ int
 get_hostname_from_env(char **host_str, unsigned *len)
 {
 	char *env_host, *tmp_str = NULL;
-	unsigned env_len;
+	size_t env_len;
 
 	// Tries to retrieve from env var first.
 	env_host = getenv(HOSTNAME_ENV_VAR);
diff --git a/crypto/external/cpl/trousers/lib/libtspi/Makefile b/crypto/external/cpl/trousers/lib/libtspi/Makefile
index 30a2367fbf4b..fe81e1df481e 100644
--- a/crypto/external/cpl/trousers/lib/libtspi/Makefile
+++ b/crypto/external/cpl/trousers/lib/libtspi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/02/04 03:19:52 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/01/07 15:43:17 christos Exp $
 .include "../Makefile.inc"
 
 CPPFLAGS+=-DAPPID=\"TSPI\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\"
@@ -108,6 +108,7 @@ tsp_random.c \
 tsp_seal.c \
 tsp_selftest.c \
 tsp_sign.c \
+tsp_tcsi_param.c \
 tsp_tick.c \
 tspi_admin.c \
 tspi_aik.c \