diff --git a/CMakeLists.txt b/CMakeLists.txt
index 642a8dd52f092ff25a838162eb86a7ac46465f23..fb9abc218beccc8aa7cf20ad1fb01f5070fe8e84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2019-2020, University of Southampton and Contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
 cmake_minimum_required(VERSION 3.2)
 
 IF(NOT DEFINED TARGET_ARCH)
diff --git a/Dockerfile b/Dockerfile
index 3219245694ceba1fcae231dbd98e30f342b36acd..c51f0649b73b40e12ee7cc20d0d809bbe82605bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2019-2020, University of Southampton and Contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
 # Stage 1: Install dependencies
 FROM ubuntu:bionic as msp-build
   RUN apt update && apt install -y ninja-build wget unzip vim
diff --git a/LICENSE b/LICENSE
index 7d578dcc1ae2f4c9d8bfc4d64c4bae72ba149a22..4111ada2cf48fb7e97f7b065ddbbaa28d76807f2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2019, University of Southampton
+Copyright (c) 2019-2020, University of Southampton
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/aes/CMakeLists.txt b/aes/CMakeLists.txt
index 3aa2ba1ac1289fe8323b3194847c80cc2ada45d7..5e3639ccca3180dfd18ff3ff7d408101fbdaf951 100644
--- a/aes/CMakeLists.txt
+++ b/aes/CMakeLists.txt
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2019-2020, University of Southampton and Contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
 cmake_minimum_required(VERSION 3.0)
 
 FOREACH(METHOD "MS" "AS" "QR")
diff --git a/aes/generate-reference-output.c b/aes/generate-reference-output.c
index bb19fd1518ea17b54fb64ba387f14da0c8fe3a68..a83ded51745e42f821d6302941faba2ec2386984 100644
--- a/aes/generate-reference-output.c
+++ b/aes/generate-reference-output.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 /* Generate reference output from host machine */
 
 #include <stdint.h>
diff --git a/aes/lipsum.h b/aes/lipsum.h
index 0dbcdc808a31a253ede8144cd6fba213829b9cfe..136f648198199d89463e8fa05fad91c248bdd0d1 100644
--- a/aes/lipsum.h
+++ b/aes/lipsum.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 #include <stdint.h>
 #include "iclib/ic.h"
 
diff --git a/aes/main.c b/aes/main.c
index 9692e7c3c88ab48a9f8307e7ad278a961154d62d..2f8daf11488cf4b0a90df8a9edf22f213282995e 100644
--- a/aes/main.c
+++ b/aes/main.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 #include "support/support.h"
 #include "iclib/ic.h"
 #include "TI_aes_128_encr_only.h"
diff --git a/cmake/cm0-toolchain.cmake b/cmake/cm0-toolchain.cmake
index c83993326ddc567a6eae35efcf7b65295b219051..bf7c5494a6a06de4b6479d7845219c5d838a3c8a 100644
--- a/cmake/cm0-toolchain.cmake
+++ b/cmake/cm0-toolchain.cmake
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2019-2020, University of Southampton and Contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
 INCLUDE(CMakeForceCompiler)
 
 # Find toolchain programs
diff --git a/cmake/common.cmake b/cmake/common.cmake
index 5bc62a194721b122ff33c8699f6cccc0c1a9c54c..52a3065a2588784f14cf0a20462a6175eb651d2b 100644
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2019-2020, University of Southampton and Contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
 
 # This file sets up:
 #  - Compiler flags
diff --git a/cmake/msp430-toolchain.cmake b/cmake/msp430-toolchain.cmake
index bb86b759a7e6f423a3abfe918c034ccf0d84b885..ef75af095fbbb2c2908581165ec34b16230b99b6 100644
--- a/cmake/msp430-toolchain.cmake
+++ b/cmake/msp430-toolchain.cmake
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2019-2020, University of Southampton and Contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
 INCLUDE(CMakeForceCompiler)
 
 # Find toolchain programs
diff --git a/cmake/tail.cmake b/cmake/tail.cmake
index 982c8f45525a172890da8bf675fcc813e9c428b9..68f989e837ab1545bbd7b7d08e75d87f1a49a13b 100644
--- a/cmake/tail.cmake
+++ b/cmake/tail.cmake
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2019-2020, University of Southampton and Contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
 cmake_minimum_required(VERSION 3.13)
 
 # Commmon function to add linker script and definitions for each target
diff --git a/crc/CMakeLists.txt b/crc/CMakeLists.txt
index 9161305db252013ebf7295025705ac8e9f1f6d8b..f67eef5f9aae2a18c94bbd6de9f8075628fd6685 100644
--- a/crc/CMakeLists.txt
+++ b/crc/CMakeLists.txt
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2019-2020, University of Southampton and Contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
 cmake_minimum_required(VERSION 3.0)
 
 FOREACH(METHOD "MS" "AS" "QR")
diff --git a/crc/generate-reference-output.c b/crc/generate-reference-output.c
index f8746dba952683e14b9543eb9c04b72358733452..e2fc1443693c94600ae5433f784ed5e29cf78911 100644
--- a/crc/generate-reference-output.c
+++ b/crc/generate-reference-output.c
@@ -1,4 +1,9 @@
-/* Generate reference output from host machine */
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/crc/lipsum.h b/crc/lipsum.h
index 1ddcc2f4ac153724763c2499f565f3145e0bea74..84ca45015dcfa54bf17e98f8a522e425a595eb7b 100644
--- a/crc/lipsum.h
+++ b/crc/lipsum.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 #include <stdint.h>
 #include "iclib/ic.h"
 
diff --git a/crc/main.c b/crc/main.c
index 4463d0b470b649022ac835b6bfd5c00a8580fee2..777457f1ec884052f0d5cd487d8160e570caae7f 100644
--- a/crc/main.c
+++ b/crc/main.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 #include "support/support.h"
 #include "iclib/ic.h"
 #include "crc.h"
diff --git a/iclib/CMakeLists.txt b/iclib/CMakeLists.txt
index 0d1c36b22abb1fa9457b052df16c48223d73c9e3..ec7ae2e9d3d39540848c18c9484bacc4f905dfd5 100644
--- a/iclib/CMakeLists.txt
+++ b/iclib/CMakeLists.txt
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2019-2020, University of Southampton and Contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
 cmake_minimum_required(VERSION 3.0)
 
 FOREACH(METHOD "MS" "AS" "QR")
diff --git a/iclib/cm0-ic.S b/iclib/cm0-ic.S
index 4264d57008875d87881bc4d3075974353cf8b3ec..3b7a12924931506cea95f2cc1221b6c6b145f815 100644
--- a/iclib/cm0-ic.S
+++ b/iclib/cm0-ic.S
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 .file "ic.S"
 .cpu cortex-m0
 .text
diff --git a/iclib/cm0-ic.c b/iclib/cm0-ic.c
index e9627480650d165b9d0ad7de22f27e5ec5b456f4..000f0150f0901213d3b22151ee44c367f93ed072 100644
--- a/iclib/cm0-ic.c
+++ b/iclib/cm0-ic.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 #include <string.h>
 #include "cmsis/core_cm0.h"
 #include "iclib/config.h"
diff --git a/iclib/cm0-ic.h b/iclib/cm0-ic.h
index d49131b907c9794e3c066978dd9eebd740f1fcd2..62fd9828a09e989f085638692a5ef3924ce58e64 100644
--- a/iclib/cm0-ic.h
+++ b/iclib/cm0-ic.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 #ifndef CM0_IC_H
 #define CM0_IC_H
 
diff --git a/iclib/config.h b/iclib/config.h
index 5b622b7638eec7f73405fdde5cc9a7fdf164bcbc..b73d6fd4e120dcb0a039810f894d2f627164f6ac 100644
--- a/iclib/config.h
+++ b/iclib/config.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 #ifndef SRC_CONFIG_H_
 #define SRC_CONFIG_H_
 
diff --git a/iclib/dvdb-AS.h b/iclib/dvdb-AS.h
index 183e474ad591135e9ab6e63640a84a1d997378a8..5e1d1d8bdf91270b5a10a793fe9ac5dcbf9a31ef 100644
--- a/iclib/dvdb-AS.h
+++ b/iclib/dvdb-AS.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 // Voltage dop per byte saved/restored to/from FRAM when no energy is supplied.
 // Generated by generate-dvdb-table.py
 #include <stdint.h>
diff --git a/iclib/dvdb-MS.h b/iclib/dvdb-MS.h
index 75c342c6197b6c5653b3abf0a9da0241f01b3910..582fef807099b3b859019283a43f08d0cd8c72f7 100644
--- a/iclib/dvdb-MS.h
+++ b/iclib/dvdb-MS.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 // Voltage dop per byte saved/restored to/from FRAM when no energy is supplied.
 // Generated by generate-dvdb-table.py
 #include <stdint.h>
diff --git a/iclib/dvdb.h b/iclib/dvdb.h
index 563c35caa11e4e787c67fffc201cdfa6e04dea42..9e0a0512363fbaa430b62ee50e2dfcd5ed432e1f 100644
--- a/iclib/dvdb.h
+++ b/iclib/dvdb.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 // Voltage dop per byte saved/restored to/from FRAM when no energy is supplied.
 // Generated by generate-dvdb-table.py
 #include <stdint.h>
diff --git a/iclib/generate-threshold-table.py b/iclib/generate-threshold-table.py
index be1a704f0217074c5cd5c108987ad067112f318f..73e22e1bb3cf2d1435415fb0ef065aa7cfbe557b 100755
--- a/iclib/generate-threshold-table.py
+++ b/iclib/generate-threshold-table.py
@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2019-2020, University of Southampton and Contributors.
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
 #!/usr/bin/env python3
 
 import sys
diff --git a/iclib/ic.h b/iclib/ic.h
index e7d1132e6f4edad907a76e6048cc563cd3727860..e0625293c8f25f0b5c4e090213b1da46e4bdff3a 100644
--- a/iclib/ic.h
+++ b/iclib/ic.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 #if defined(MSP430_ARCH)
 #include "iclib/memory-management.h"
 #include "iclib/msp430-ic.h"
diff --git a/iclib/memory-management.c b/iclib/memory-management.c
index 3b59a2fadab48e4436147627069ace44e249022b..c6ea5dd36ee60fc572b93d663309496a6d946cb7 100644
--- a/iclib/memory-management.c
+++ b/iclib/memory-management.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 /***************************** Include Files *********************************/
 #include <stdint.h>
 #include <string.h>
diff --git a/iclib/memory-management.h b/iclib/memory-management.h
index 5d040beea168e3474c47e22f35361460ed050ea9..b6834ddd4c59b446c5f28cf9aadad20aab33a22f 100644
--- a/iclib/memory-management.h
+++ b/iclib/memory-management.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 #ifndef SRC_MEMORY_MANAGEMENT_H_
 #define SRC_MEMORY_MANAGEMENT_H_
 
diff --git a/iclib/msp430-ic.c b/iclib/msp430-ic.c
index aba50f2fdfa21e7158240e2cf89afb86fda42332..9812742c7c5a09cf9a99f54e8b523a8a7aa1fcf6 100644
--- a/iclib/msp430-ic.c
+++ b/iclib/msp430-ic.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2018-2020, University of Southampton.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 #include "iclib/config.h"
 #include "iclib/memory-management.h"
 #include "iclib/msp430-ic.h"