diff --git a/.gitignore b/.gitignore
index 26b492da..9b46ad2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,6 +88,7 @@ tools/test-expect-version/test-expect-version
 tools/test-update-server/server
 tools/uart-flash-server/ufserver
 tools/unit-tests/unit-parser
+tools/bin-assemble/bin-assemble
 config/*.ld
 
 # Generated confiuguration file
diff --git a/IDE/CCS/TMS570LC43xx/target.h b/IDE/CCS/TMS570LC43xx/target.h
index a4290f18..44e81ebf 100644
--- a/IDE/CCS/TMS570LC43xx/target.h
+++ b/IDE/CCS/TMS570LC43xx/target.h
@@ -5,7 +5,7 @@
  * target.h is automatically generated using the template in target.h.in by running
  * "make config".
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/Makefile b/Makefile
index 693db09f..7851c876 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ include tools/config.mk
 
 ## Initializers
 WOLFBOOT_ROOT?=$(PWD)
-CFLAGS:=-D"__WOLFBOOT" -D"WOLFBOOT_VERSION=$(WOLFBOOT_VERSION)UL"
+CFLAGS:=-D"__WOLFBOOT"
 CFLAGS+=-Werror
 LSCRIPT:=config/target.ld
 LDFLAGS:=
diff --git a/README.md b/README.md
index 33b37ada..e57595dd 100644
--- a/README.md
+++ b/README.md
@@ -236,5 +236,18 @@ USE_LOCAL_WOLFSSL=/usr/local pip3 install .
    * SPI driver: STM32L0x3
    * Uart driver: STM32L0x3
 
+### V1.8 (2021-07-19)
+ * Use SP math for RSA4096
+ * Updated RSA to use inline operation and disable OAEP padding
+ * Memory model: removed dependency on XMALLOC/XFREE for ECC and RSA operations
+ * Added option WOLFBOOT_SMALL_STACK with hardcoded compile-time buffers
+ * Added option SIGN=NONE to disable secure boot at compile time
+ * Fix self-update documentation
+ * Added test cases for configuration option combinations
+ * Hardware support
+   * New ARCH: PowerPC
+   * New ARCH: ARM Cortex-R
+   * New HAL: NXP T2080
+   * New HAL: TI TMS570LC435
+   * STM32H7: Correct BANK2 offset
 
-  
diff --git a/hal/cc26x2.c b/hal/cc26x2.c
index ededd8f9..504d4e36 100644
--- a/hal/cc26x2.c
+++ b/hal/cc26x2.c
@@ -1,6 +1,6 @@
 /* cc26x2.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/hifive1.c b/hal/hifive1.c
index bdd7416b..3f9c8230 100644
--- a/hal/hifive1.c
+++ b/hal/hifive1.c
@@ -1,6 +1,6 @@
 /* hifive1.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/imx_rt.c b/hal/imx_rt.c
index c0e2b65c..9133fbff 100644
--- a/hal/imx_rt.c
+++ b/hal/imx_rt.c
@@ -3,7 +3,7 @@
  * Custom HAL implementation. Defines the
  * functions used by wolfboot for a specific target.
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/imx_rt_nor.h b/hal/imx_rt_nor.h
index 101c8ce0..a0fa737c 100644
--- a/hal/imx_rt_nor.h
+++ b/hal/imx_rt_nor.h
@@ -3,7 +3,7 @@
  *
  * Description of the NOR configuration interface required by the board.
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * wolfSSL is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/hal/kinetis.c b/hal/kinetis.c
index 3a964757..9c4cccac 100644
--- a/hal/kinetis.c
+++ b/hal/kinetis.c
@@ -1,6 +1,6 @@
 /* kinetis.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/lpc.c b/hal/lpc.c
index a7156e7c..bff18ff4 100644
--- a/hal/lpc.c
+++ b/hal/lpc.c
@@ -1,6 +1,6 @@
 /* lpc.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/nrf52.c b/hal/nrf52.c
index 55d0e4da..8865eef2 100644
--- a/hal/nrf52.c
+++ b/hal/nrf52.c
@@ -1,6 +1,6 @@
 /* nrf52.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/psoc6.c b/hal/psoc6.c
index 235f9e75..5e13a6bc 100644
--- a/hal/psoc6.c
+++ b/hal/psoc6.c
@@ -1,6 +1,6 @@
 /* psoc6.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/raspi3.c b/hal/raspi3.c
index 932e75a0..1821d9a0 100644
--- a/hal/raspi3.c
+++ b/hal/raspi3.c
@@ -1,6 +1,6 @@
 /* raspi3.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/samr21.c b/hal/samr21.c
index 7187e28f..23184d9e 100644
--- a/hal/samr21.c
+++ b/hal/samr21.c
@@ -1,6 +1,6 @@
 /* samr21.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/skeleton.c b/hal/skeleton.c
index be0e3088..30f845ba 100644
--- a/hal/skeleton.c
+++ b/hal/skeleton.c
@@ -3,7 +3,7 @@
  * Stubs for custom HAL implementation. Defines the 
  * functions used by wolfboot for a specific target.
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/spi/spi_drv_nrf52.c b/hal/spi/spi_drv_nrf52.c
index 02273537..d1524d6c 100644
--- a/hal/spi/spi_drv_nrf52.c
+++ b/hal/spi/spi_drv_nrf52.c
@@ -6,7 +6,7 @@
  *
  * Pinout: see spi_drv_nrf52.h
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/spi/spi_drv_stm32.c b/hal/spi/spi_drv_stm32.c
index 0cfc3075..f6014e16 100644
--- a/hal/spi/spi_drv_stm32.c
+++ b/hal/spi/spi_drv_stm32.c
@@ -6,7 +6,7 @@
  *
  * Pinout: see spi_drv_stm32.h
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/spi/spi_drv_zynq.c b/hal/spi/spi_drv_zynq.c
index 78a6e388..ba35b0ec 100644
--- a/hal/spi/spi_drv_zynq.c
+++ b/hal/spi/spi_drv_zynq.c
@@ -1,6 +1,6 @@
 /* spi_drv_zynq.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/stm32f4.c b/hal/stm32f4.c
index 7aca6ae1..27e501e0 100644
--- a/hal/stm32f4.c
+++ b/hal/stm32f4.c
@@ -1,6 +1,6 @@
 /* stm32f4.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/stm32f7.c b/hal/stm32f7.c
index 511ba504..f910610f 100644
--- a/hal/stm32f7.c
+++ b/hal/stm32f7.c
@@ -1,6 +1,6 @@
 /* stm32f7.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/stm32g0.c b/hal/stm32g0.c
index b26a1950..dde0c2e9 100644
--- a/hal/stm32g0.c
+++ b/hal/stm32g0.c
@@ -1,6 +1,6 @@
 /* stm32g0.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/stm32h7.c b/hal/stm32h7.c
index ccb814e8..802301f6 100644
--- a/hal/stm32h7.c
+++ b/hal/stm32h7.c
@@ -1,6 +1,6 @@
 /* stm32h7.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/stm32l0.c b/hal/stm32l0.c
index 9d5f3277..b913abab 100644
--- a/hal/stm32l0.c
+++ b/hal/stm32l0.c
@@ -1,6 +1,6 @@
 /* stm32l0.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/stm32l5.c b/hal/stm32l5.c
index 92e69298..3abccb29 100644
--- a/hal/stm32l5.c
+++ b/hal/stm32l5.c
@@ -1,6 +1,6 @@
 /* stm32l5.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/stm32l5_ns.c b/hal/stm32l5_ns.c
index 64ebe0b1..95ea720e 100644
--- a/hal/stm32l5_ns.c
+++ b/hal/stm32l5_ns.c
@@ -1,6 +1,6 @@
 /* stm32l5.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/stm32wb.c b/hal/stm32wb.c
index 2e6e5934..21db5e37 100644
--- a/hal/stm32wb.c
+++ b/hal/stm32wb.c
@@ -1,6 +1,6 @@
 /* stm32wb.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/uart/uart_drv_lpc.c b/hal/uart/uart_drv_lpc.c
index acf519e7..0218906a 100644
--- a/hal/uart/uart_drv_lpc.c
+++ b/hal/uart/uart_drv_lpc.c
@@ -4,7 +4,7 @@
  *
  * Example implementation for LPC54xxx, using UART0.
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/uart/uart_drv_stm32f4.c b/hal/uart/uart_drv_stm32f4.c
index c7e723ec..3197c308 100644
--- a/hal/uart/uart_drv_stm32f4.c
+++ b/hal/uart/uart_drv_stm32f4.c
@@ -6,7 +6,7 @@
  *
  * Pinout: RX=PD9, TX=PD8
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/uart/uart_drv_stm32l0.c b/hal/uart/uart_drv_stm32l0.c
index 61f396fd..44cd2894 100644
--- a/hal/uart/uart_drv_stm32l0.c
+++ b/hal/uart/uart_drv_stm32l0.c
@@ -6,7 +6,7 @@
  *
  * Pinout: RX=PA3, TX=PA2 
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/uart/uart_drv_stm32wb.c b/hal/uart/uart_drv_stm32wb.c
index 336963f4..5f340e26 100644
--- a/hal/uart/uart_drv_stm32wb.c
+++ b/hal/uart/uart_drv_stm32wb.c
@@ -6,7 +6,7 @@
  *
  * Pinout: RX=PB7, TX=PB6 (VCOM port UART1 -> STLINK USB)
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/hal/zynq.c b/hal/zynq.c
index d73b8aff..a8b2d6e6 100644
--- a/hal/zynq.c
+++ b/hal/zynq.c
@@ -1,6 +1,6 @@
 /* zynq.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/include/encrypt.h b/include/encrypt.h
index 0850c621..97f97075 100644
--- a/include/encrypt.h
+++ b/include/encrypt.h
@@ -2,7 +2,7 @@
  *
  * Functions to encrypt/decrypt external flash content
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/include/hal.h b/include/hal.h
index d80514a3..8e33adfb 100644
--- a/include/hal.h
+++ b/include/hal.h
@@ -2,7 +2,7 @@
  *
  * The HAL API definitions.
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/include/image.h b/include/image.h
index 9d8c008e..0122154d 100644
--- a/include/image.h
+++ b/include/image.h
@@ -3,7 +3,7 @@
  * Functions to help with wolfBoot image header
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/include/loader.h b/include/loader.h
index 40a81b23..32d0477a 100644
--- a/include/loader.h
+++ b/include/loader.h
@@ -3,7 +3,7 @@
  * Public key information for the signed images
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/include/printf.h b/include/printf.h
index e96630ba..5a7ea02f 100644
--- a/include/printf.h
+++ b/include/printf.h
@@ -2,7 +2,7 @@
  *
  * The HAL API definitions.
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/include/spi_drv.h b/include/spi_drv.h
index 4e1c5613..145ff818 100644
--- a/include/spi_drv.h
+++ b/include/spi_drv.h
@@ -7,7 +7,7 @@
  *     implementing the spi_ calls below.
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/include/spi_flash.h b/include/spi_flash.h
index c8d6e0f4..507c6063 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -6,7 +6,7 @@
  * Compile with SPI_FLASH=1
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/include/target.h.in b/include/target.h.in
index 9286d533..23936182 100644
--- a/include/target.h.in
+++ b/include/target.h.in
@@ -5,7 +5,7 @@
  * target.h is automatically generated using the template in target.h.in by running
  * "make config".
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/include/uart_flash.h b/include/uart_flash.h
index 3556edf5..566d16b5 100644
--- a/include/uart_flash.h
+++ b/include/uart_flash.h
@@ -9,7 +9,7 @@
  * emulated non-volatile image via UART.
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/include/user_settings.h b/include/user_settings.h
index ea20bdc8..cd596134 100644
--- a/include/user_settings.h
+++ b/include/user_settings.h
@@ -4,7 +4,7 @@
  * Enabled via WOLFSSL_USER_SETTINGS.
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/include/wolfboot/version.h b/include/wolfboot/version.h
new file mode 100644
index 00000000..21bf73f5
--- /dev/null
+++ b/include/wolfboot/version.h
@@ -0,0 +1,43 @@
+/* version.h
+ *
+ * The wolfBoot library version
+ *
+ * Copyright (C) 2021 wolfSSL Inc.
+ *
+ * This file is part of wolfBoot.
+ *
+ * wolfBoot is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfBoot is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
+#ifndef WOLFBOOT_VERSION_H
+#define WOLFBOOT_VERSION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define LIBWOLFBOOT_VERSION_STRING "1.8.0"
+#define LIBWOLFBOOT_VERSION_HEX 0x01008000
+
+#ifndef WOLFBOOT_VERSION
+    #define WOLFBOOT_VERSION LIBWOLFBOOT_VERSION_HEX
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WOLFBOOT_VERSION_H */
diff --git a/include/wolfboot/wolfboot.h b/include/wolfboot/wolfboot.h
index 733f6d4e..c2e48e9e 100644
--- a/include/wolfboot/wolfboot.h
+++ b/include/wolfboot/wolfboot.h
@@ -2,7 +2,7 @@
  *
  * The wolfBoot API definitions.
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
@@ -27,6 +27,7 @@
 
 #include <stdint.h>
 #include "target.h"
+#include "wolfboot/version.h"
 
 
 #ifndef IMAGE_HEADER_SIZE
diff --git a/options.mk b/options.mk
index b274b9c6..cb42bad9 100644
--- a/options.mk
+++ b/options.mk
@@ -211,6 +211,12 @@ ifeq ($(PKA),1)
   CFLAGS+=$(PKA_EXTRA_CFLAGS)
 endif
 
+ifneq ($(WOLFBOOT_VERSION),0)
+  ifneq ($(WOLFBOOT_VERSION),)
+    CFLAGS+=-DWOLFBOOT_VERSION=$(WOLFBOOT_VERSION)
+  endif
+endif
+
 OBJS+=$(PUBLIC_KEY_OBJS)
 OBJS+=$(UPDATE_OBJS)
 
diff --git a/src/boot_aarch64.c b/src/boot_aarch64.c
index 484fc284..94076afe 100644
--- a/src/boot_aarch64.c
+++ b/src/boot_aarch64.c
@@ -1,6 +1,6 @@
 /* boot_aarch64.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/boot_aarch64_start.S b/src/boot_aarch64_start.S
index 16c3e8dd..594a97a6 100644
--- a/src/boot_aarch64_start.S
+++ b/src/boot_aarch64_start.S
@@ -1,6 +1,6 @@
 /**
  * Aarch64 bootup
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/boot_riscv.c b/src/boot_riscv.c
index 5eca63c3..26d5eb22 100644
--- a/src/boot_riscv.c
+++ b/src/boot_riscv.c
@@ -1,6 +1,6 @@
 /* boot_riscv.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/image.c b/src/image.c
index 1a14feaa..27c2f3e1 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,6 +1,6 @@
 /* image.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/libwolfboot.c b/src/libwolfboot.c
index 52998ebb..a2e92a49 100644
--- a/src/libwolfboot.c
+++ b/src/libwolfboot.c
@@ -1,6 +1,6 @@
 /* libwolfboot.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/loader.c b/src/loader.c
index 3e58d5dd..5d251c97 100644
--- a/src/loader.c
+++ b/src/loader.c
@@ -1,6 +1,6 @@
 /* loader.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/spi_flash.c b/src/spi_flash.c
index 20dfb934..b56ec664 100644
--- a/src/spi_flash.c
+++ b/src/spi_flash.c
@@ -4,7 +4,7 @@
  * functionalities, on top of the spi_drv.h HAL.
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/string.c b/src/string.c
index 319402c0..b82a5054 100644
--- a/src/string.c
+++ b/src/string.c
@@ -3,7 +3,7 @@
  * Implementations of standard library functions to eliminate external dependencies.
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/uart_flash.c b/src/uart_flash.c
index 4063bac4..9ed9d693 100644
--- a/src/uart_flash.c
+++ b/src/uart_flash.c
@@ -8,7 +8,7 @@
  * interface.
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/update_flash.c b/src/update_flash.c
index 31eb0315..ac41f32c 100644
--- a/src/update_flash.c
+++ b/src/update_flash.c
@@ -3,7 +3,7 @@
  * Implementation for Flash based updater
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/update_flash_hwswap.c b/src/update_flash_hwswap.c
index 27c9ba01..7c1b6e90 100644
--- a/src/update_flash_hwswap.c
+++ b/src/update_flash_hwswap.c
@@ -3,7 +3,7 @@
  * Implementation for hardware assisted updater
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/update_ram.c b/src/update_ram.c
index 6aa24afb..dda57c93 100644
--- a/src/update_ram.c
+++ b/src/update_ram.c
@@ -3,7 +3,7 @@
  * Implementation for RAM based updater
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/src/vector_riscv.S b/src/vector_riscv.S
index 605dca11..d1393ef1 100644
--- a/src/vector_riscv.S
+++ b/src/vector_riscv.S
@@ -1,6 +1,6 @@
 /**
  * RISC-V bootup
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_hifive1.c b/test-app/app_hifive1.c
index de285f1b..0f616621 100644
--- a/test-app/app_hifive1.c
+++ b/test-app/app_hifive1.c
@@ -1,6 +1,6 @@
 /* hifive1.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_imx_rt.c b/test-app/app_imx_rt.c
index f7821001..03c98de8 100644
--- a/test-app/app_imx_rt.c
+++ b/test-app/app_imx_rt.c
@@ -1,6 +1,6 @@
 /* wolfBoot test application for iMX-RT1060-EVK
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * wolfSSL is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test-app/app_kinetis.c b/test-app/app_kinetis.c
index c81698fa..fc001455 100644
--- a/test-app/app_kinetis.c
+++ b/test-app/app_kinetis.c
@@ -1,6 +1,6 @@
 /* kinetis.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_lpc.c b/test-app/app_lpc.c
index 8495fc8d..c011aaa0 100644
--- a/test-app/app_lpc.c
+++ b/test-app/app_lpc.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal boot-led-on application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_nrf52.c b/test-app/app_nrf52.c
index 30f80716..f289dc91 100644
--- a/test-app/app_nrf52.c
+++ b/test-app/app_nrf52.c
@@ -1,6 +1,6 @@
 /* nrf52.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_psoc6.c b/test-app/app_psoc6.c
index 4d2c4379..63dd675c 100644
--- a/test-app/app_psoc6.c
+++ b/test-app/app_psoc6.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal boot-led-on application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_raspi3.c b/test-app/app_raspi3.c
index 427a177c..16746e3a 100644
--- a/test-app/app_raspi3.c
+++ b/test-app/app_raspi3.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal boot application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_samr21.c b/test-app/app_samr21.c
index dda87ff9..283eb786 100644
--- a/test-app/app_samr21.c
+++ b/test-app/app_samr21.c
@@ -1,6 +1,6 @@
 /* samr21.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_stm32f4.c b/test-app/app_stm32f4.c
index ae53bd9b..71e8d1fe 100644
--- a/test-app/app_stm32f4.c
+++ b/test-app/app_stm32f4.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal blinking led application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_stm32g0.c b/test-app/app_stm32g0.c
index 5e25e142..c7df3ab0 100644
--- a/test-app/app_stm32g0.c
+++ b/test-app/app_stm32g0.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal boot-led-on application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_stm32h7.c b/test-app/app_stm32h7.c
index 62c0f439..81d3e970 100644
--- a/test-app/app_stm32h7.c
+++ b/test-app/app_stm32h7.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal application.
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_stm32l0.c b/test-app/app_stm32l0.c
index c981b0f6..1eee4ba0 100644
--- a/test-app/app_stm32l0.c
+++ b/test-app/app_stm32l0.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal boot-led-on application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_stm32l5.c b/test-app/app_stm32l5.c
index 1ccea2c6..f47c37bf 100644
--- a/test-app/app_stm32l5.c
+++ b/test-app/app_stm32l5.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal application.
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_stm32wb.c b/test-app/app_stm32wb.c
index 0ad7f9af..92d66d2f 100644
--- a/test-app/app_stm32wb.c
+++ b/test-app/app_stm32wb.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal boot-led-on application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/app_zynq.c b/test-app/app_zynq.c
index 2d2df7d2..807884ce 100644
--- a/test-app/app_zynq.c
+++ b/test-app/app_zynq.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal boot application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/imx_rt_clock_config.c b/test-app/imx_rt_clock_config.c
index 1a8b27f5..e23a6c0e 100644
--- a/test-app/imx_rt_clock_config.c
+++ b/test-app/imx_rt_clock_config.c
@@ -1,6 +1,6 @@
 /* wolfBoot test application for i.MX RT1060-EVK
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * wolfSSL is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test-app/led.c b/test-app/led.c
index e183f6cb..c965dec2 100644
--- a/test-app/led.c
+++ b/test-app/led.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal blinking led application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/led.h b/test-app/led.h
index 3c40e4de..3d2ccdae 100644
--- a/test-app/led.h
+++ b/test-app/led.h
@@ -2,7 +2,7 @@
  *
  * Test bare-metal blinking led application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/startup_arm.c b/test-app/startup_arm.c
index f1535c97..10dc7e29 100644
--- a/test-app/startup_arm.c
+++ b/test-app/startup_arm.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal blinking led application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/startup_riscv.c b/test-app/startup_riscv.c
index 50f9d4ac..fcbc6112 100644
--- a/test-app/startup_riscv.c
+++ b/test-app/startup_riscv.c
@@ -1,6 +1,6 @@
 /* startup_riscv.c
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/system.c b/test-app/system.c
index 01d6c574..12fb5ca1 100644
--- a/test-app/system.c
+++ b/test-app/system.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal blinking led application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/system.h b/test-app/system.h
index e8089c03..18c0876c 100644
--- a/test-app/system.h
+++ b/test-app/system.h
@@ -1,7 +1,7 @@
 /* system.h
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/timer.c b/test-app/timer.c
index 0b734084..b3008c2b 100644
--- a/test-app/timer.c
+++ b/test-app/timer.c
@@ -2,7 +2,7 @@
  *
  * Test bare-metal blinking led application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/timer.h b/test-app/timer.h
index bd66daea..31ec64c1 100644
--- a/test-app/timer.h
+++ b/test-app/timer.h
@@ -2,7 +2,7 @@
  *
  * Test bare-metal blinking led application
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/test-app/vector_riscv.S b/test-app/vector_riscv.S
index 24603e9f..b2a9aeaf 100644
--- a/test-app/vector_riscv.S
+++ b/test-app/vector_riscv.S
@@ -1,6 +1,6 @@
 /**
  * RISC-V bootup
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/tools/bin-assemble/bin-assemble.c b/tools/bin-assemble/bin-assemble.c
index 610b11f6..1f14a0a3 100644
--- a/tools/bin-assemble/bin-assemble.c
+++ b/tools/bin-assemble/bin-assemble.c
@@ -1,6 +1,6 @@
 /* bin-assemble.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/tools/check_config/check_config.c b/tools/check_config/check_config.c
index 880dc16d..e20107f4 100644
--- a/tools/check_config/check_config.c
+++ b/tools/check_config/check_config.c
@@ -3,7 +3,7 @@
  * Unit test for parser functions in libwolfboot.c
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/tools/keytools/keygen.c b/tools/keytools/keygen.c
index 7de2a7b9..441e187c 100644
--- a/tools/keytools/keygen.c
+++ b/tools/keytools/keygen.c
@@ -3,7 +3,7 @@
  * C native key generation tool
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/tools/keytools/keygen.py b/tools/keytools/keygen.py
index 7825ff65..c63548cb 100755
--- a/tools/keytools/keygen.py
+++ b/tools/keytools/keygen.py
@@ -2,7 +2,7 @@
 '''
  * keygen.py
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/tools/keytools/sign.c b/tools/keytools/sign.c
index d05b0f51..0005d4d3 100755
--- a/tools/keytools/sign.c
+++ b/tools/keytools/sign.c
@@ -3,7 +3,7 @@
  * C native signing tool
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/tools/keytools/sign.py b/tools/keytools/sign.py
index c6049baf..78bd0602 100755
--- a/tools/keytools/sign.py
+++ b/tools/keytools/sign.py
@@ -2,7 +2,7 @@
 '''
  * sign.py
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/tools/keytools/user_settings.h b/tools/keytools/user_settings.h
index 8187a561..0994a2ca 100755
--- a/tools/keytools/user_settings.h
+++ b/tools/keytools/user_settings.h
@@ -4,7 +4,7 @@
  * Enabled via WOLFSSL_USER_SETTINGS.
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/tools/test-expect-version/test-expect-version.c b/tools/test-expect-version/test-expect-version.c
index 744f86e5..55a8c517 100644
--- a/tools/test-expect-version/test-expect-version.c
+++ b/tools/test-expect-version/test-expect-version.c
@@ -1,6 +1,6 @@
 /* test-update-server.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL. (formerly known as CyaSSL)
  *
diff --git a/tools/test-update-server/server.c b/tools/test-update-server/server.c
index d6f05f32..77676874 100644
--- a/tools/test-update-server/server.c
+++ b/tools/test-update-server/server.c
@@ -1,6 +1,6 @@
 /* test-update-server.c
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfSSL. (formerly known as CyaSSL)
  *
diff --git a/tools/uart-flash-server/ufserver.c b/tools/uart-flash-server/ufserver.c
index 1a8dd453..ce459c9f 100644
--- a/tools/uart-flash-server/ufserver.c
+++ b/tools/uart-flash-server/ufserver.c
@@ -4,7 +4,7 @@
  *
  * Run on HOST machine to export an emulated external, non-volatile memory.
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *
diff --git a/tools/unit-tests/unit-parser.c b/tools/unit-tests/unit-parser.c
index 25e3f87b..8b18f2dd 100644
--- a/tools/unit-tests/unit-parser.c
+++ b/tools/unit-tests/unit-parser.c
@@ -3,7 +3,7 @@
  * Unit test for parser functions in libwolfboot.c
  *
  *
- * Copyright (C) 2020 wolfSSL Inc.
+ * Copyright (C) 2021 wolfSSL Inc.
  *
  * This file is part of wolfBoot.
  *