diff --git a/Makefile b/Makefile
index 48332d59ad..28e416dd49 100644
--- a/Makefile
+++ b/Makefile
@@ -135,7 +135,7 @@ wolfboot.hex: wolfboot.elf
 align: wolfboot-align.bin
 
 wolfboot-align.bin: wolfboot.bin
-	@cat include/target.h |grep WOLFBOOT_PARTITION_BOOT_ADDRESS | head -1 | sed -e "s/.*[ ]//g" > .wolfboot-offset
+	@cat include/target.h |grep WOLFBOOT_PARTITION_BOOT_ADDRESS | tr -d "\n\r" | sed -e "s/.*[ ]//g" > .wolfboot-offset
 	@printf "%d" `cat .wolfboot-offset` > .wolfboot-offset
 	@printf "%d" $(ARCH_FLASH_OFFSET) >.wolfboot-arch-offset
 	@expr `cat .wolfboot-offset` - `cat .wolfboot-arch-offset` >.wolfboot-partition-size
diff --git a/lib/wolfssl b/lib/wolfssl
index eaf5c3042d..e4059a65b9 160000
--- a/lib/wolfssl
+++ b/lib/wolfssl
@@ -1 +1 @@
-Subproject commit eaf5c3042d71b60ae246f781d6f92af51455915d
+Subproject commit e4059a65b9b53ea2817b81afe6a0562ad6a5d342