diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt
index 50b7ba7c4..4a418db7c 100644
--- a/boot/CMakeLists.txt
+++ b/boot/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/boot/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/boot/Make.defs b/boot/Make.defs
index b0e6794f6..78765dbdb 100644
--- a/boot/Make.defs
+++ b/boot/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/boot/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/boot/Makefile b/boot/Makefile
index e20a7c4a3..3bbae8765 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/boot/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/boot/mcuboot/CMakeLists.txt b/boot/mcuboot/CMakeLists.txt
index 23418960f..28fe0d13b 100644
--- a/boot/mcuboot/CMakeLists.txt
+++ b/boot/mcuboot/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/boot/mcuboot/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/boot/mcuboot/Make.defs b/boot/mcuboot/Make.defs
index f56743811..446a785e2 100644
--- a/boot/mcuboot/Make.defs
+++ b/boot/mcuboot/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/boot/mcuboot/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/boot/mcuboot/Makefile b/boot/mcuboot/Makefile
index 64157bf09..e6851be93 100644
--- a/boot/mcuboot/Makefile
+++ b/boot/mcuboot/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/boot/mcuboot/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/boot/miniboot/CMakeLists.txt b/boot/miniboot/CMakeLists.txt
index e23c6ddaa..2c488cec7 100644
--- a/boot/miniboot/CMakeLists.txt
+++ b/boot/miniboot/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/boot/miniboot/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/boot/miniboot/Make.defs b/boot/miniboot/Make.defs
index 88b33ade7..0f082485d 100644
--- a/boot/miniboot/Make.defs
+++ b/boot/miniboot/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/boot/miniboot/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/boot/miniboot/Makefile b/boot/miniboot/Makefile
index 0bf17a3aa..c5c4de340 100644
--- a/boot/miniboot/Makefile
+++ b/boot/miniboot/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/boot/miniboot/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/boot/miniboot/miniboot_main.c b/boot/miniboot/miniboot_main.c
index 9d280c326..63f47465c 100644
--- a/boot/miniboot/miniboot_main.c
+++ b/boot/miniboot/miniboot_main.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/boot/miniboot/miniboot_main.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/boot/nxboot/CMakeLists.txt b/boot/nxboot/CMakeLists.txt
index fb4056277..1ea82b7a8 100644
--- a/boot/nxboot/CMakeLists.txt
+++ b/boot/nxboot/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/boot/nxboot/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/boot/nxboot/Make.defs b/boot/nxboot/Make.defs
index 6e7660c45..4a472724d 100644
--- a/boot/nxboot/Make.defs
+++ b/boot/nxboot/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/boot/nxboot/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/boot/nxboot/Makefile b/boot/nxboot/Makefile
index f9666c7aa..9596bf88f 100644
--- a/boot/nxboot/Makefile
+++ b/boot/nxboot/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/boot/nxboot/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/boot/nxboot/include/nxboot.h b/boot/nxboot/include/nxboot.h
index 7047cf6e1..2ecf961c7 100644
--- a/boot/nxboot/include/nxboot.h
+++ b/boot/nxboot/include/nxboot.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/boot/nxboot/include/nxboot.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/boot/nxboot/loader/boot.c b/boot/nxboot/loader/boot.c
index 6bd9a2dcb..ec1ec3c65 100644
--- a/boot/nxboot/loader/boot.c
+++ b/boot/nxboot/loader/boot.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/boot/nxboot/loader/boot.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/boot/nxboot/loader/flash.c b/boot/nxboot/loader/flash.c
index fdeaf77f2..4c32a8831 100644
--- a/boot/nxboot/loader/flash.c
+++ b/boot/nxboot/loader/flash.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/boot/nxboot/loader/flash.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/boot/nxboot/loader/flash.h b/boot/nxboot/loader/flash.h
index 1fb4be56d..653c4c8b9 100644
--- a/boot/nxboot/loader/flash.h
+++ b/boot/nxboot/loader/flash.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/boot/nxboot/loader/flash.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/boot/nxboot/nxboot_main.c b/boot/nxboot/nxboot_main.c
index 81ae2f40c..09e556b2b 100644
--- a/boot/nxboot/nxboot_main.c
+++ b/boot/nxboot/nxboot_main.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/boot/nxboot/nxboot_main.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/boot/nxboot/tools/nximage.py b/boot/nxboot/tools/nximage.py
index 92c0b3911..1a9d68a1f 100644
--- a/boot/nxboot/tools/nximage.py
+++ b/boot/nxboot/tools/nximage.py
@@ -1,3 +1,25 @@
+#!/usr/bin/env python3
+############################################################################
+# apps/boot/nxboot/tools/nximage.py
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
 """Python script that prepares the NuttX image to be used with NX bootloader"""
 
 import argparse