diff --git a/litex/tools/litex_client.py b/litex/tools/litex_client.py
index 79bef180d..0ed7a085f 100644
--- a/litex/tools/litex_client.py
+++ b/litex/tools/litex_client.py
@@ -1,6 +1,9 @@
-# This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
-# This file is Copyright (c) 2016 Tim 'mithro' Ansell <mithro@mithis.com>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
+# Copyright (c) 2016 Tim 'mithro' Ansell <mithro@mithis.com>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import socket
 
diff --git a/litex/tools/litex_crossover_uart.py b/litex/tools/litex_crossover_uart.py
index 57aed37c8..3e6190178 100755
--- a/litex/tools/litex_crossover_uart.py
+++ b/litex/tools/litex_crossover_uart.py
@@ -1,7 +1,10 @@
 #!/usr/bin/env python3
 
-# This file is Copyright (c) 2020 Florent Kermarrec <florent@enjoy-digital.fr>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2020 Florent Kermarrec <florent@enjoy-digital.fr>
+# SPDX-License-Identifier: BSD-2-Clause
 
 # Proof of Concept to use the crossover UART with lxterm over a bridge.
 
diff --git a/litex/tools/litex_gen.py b/litex/tools/litex_gen.py
index 5f1d1c4e9..47152edda 100755
--- a/litex/tools/litex_gen.py
+++ b/litex/tools/litex_gen.py
@@ -1,7 +1,11 @@
 #!/usr/bin/env python3
 
-# This file is Copyright (c) 2020 Antmicro <www.antmicro.com>
-# This file is Copyright (c) 2020 Florent Kermarrec <florent@enjoy-digital.fr>
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2020 Antmicro <www.antmicro.com>
+# Copyright (c) 2020 Florent Kermarrec <florent@enjoy-digital.fr>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import argparse
 
@@ -77,7 +81,7 @@ class LiteXCore(SoCMini):
                     Subsignal("locked", Pins(1)),
                 )
             ])
-            
+
             self.clock_domains.cd_out0 = ClockDomain(reset_less=True)
             self.clock_domains.cd_out1 = ClockDomain(reset_less=True)
             self.submodules.mmcm = mmcm = S7MMCM()
diff --git a/litex/tools/litex_json2dts.py b/litex/tools/litex_json2dts.py
index 8272aaa59..8112e8d2e 100755
--- a/litex/tools/litex_json2dts.py
+++ b/litex/tools/litex_json2dts.py
@@ -1,8 +1,11 @@
 #!/usr/bin/env python3
 
-# This file is Copyright (c) 2019-2020 Florent Kermarrec <florent@enjoy-digital.fr>
-# This file is Copyright (c) 2020 Antmicro <www.antmicro.com>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2019-2020 Florent Kermarrec <florent@enjoy-digital.fr>
+# Copyright (c) 2020 Antmicro <www.antmicro.com>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import sys
 import json
diff --git a/litex/tools/litex_jtag_uart.py b/litex/tools/litex_jtag_uart.py
index 4be16fd3b..a0ab7a729 100755
--- a/litex/tools/litex_jtag_uart.py
+++ b/litex/tools/litex_jtag_uart.py
@@ -1,7 +1,10 @@
 #!/usr/bin/env python3
 
-# This file is Copyright (c) 2020 Florent Kermarrec <florent@enjoy-digital.fr>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2020 Florent Kermarrec <florent@enjoy-digital.fr>
+# SPDX-License-Identifier: BSD-2-Clause
 
 # Proof of Concept to use the JTAG UART with lxterm.
 
diff --git a/litex/tools/litex_read_verilog.py b/litex/tools/litex_read_verilog.py
index a74bea0bf..3db30f1d6 100755
--- a/litex/tools/litex_read_verilog.py
+++ b/litex/tools/litex_read_verilog.py
@@ -1,7 +1,10 @@
 #!/usr/bin/env python3
 
-# This file is Copyright (c) 2018-2019 Florent Kermarrec <florent@enjoy-digital.fr>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2018-2019 Florent Kermarrec <florent@enjoy-digital.fr>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import os
 import sys
diff --git a/litex/tools/litex_server.py b/litex/tools/litex_server.py
index 8d9029b3c..7d5f72393 100755
--- a/litex/tools/litex_server.py
+++ b/litex/tools/litex_server.py
@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
 
-# This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
-# This file is Copyright (c) 2019 Sean Cross <sean@xobs.io>
-# This file is Copyright (c) 2018 Felix Held <felix-github@felixheld.de>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
+# Copyright (c) 2019 Sean Cross <sean@xobs.io>
+# Copyright (c) 2018 Felix Held <felix-github@felixheld.de>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import argparse
 
diff --git a/litex/tools/litex_sim.py b/litex/tools/litex_sim.py
index c07cb3a98..bac10e3d2 100755
--- a/litex/tools/litex_sim.py
+++ b/litex/tools/litex_sim.py
@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
 
-# This file is Copyright (c) 2015-2020 Florent Kermarrec <florent@enjoy-digital.fr>
-# This file is Copyright (c) 2020 Antmicro <www.antmicro.com>
-# This file is Copyright (c) 2017 Pierre-Olivier Vauboin <po@lambdaconcept>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2015-2020 Florent Kermarrec <florent@enjoy-digital.fr>
+# Copyright (c) 2020 Antmicro <www.antmicro.com>
+# Copyright (c) 2017 Pierre-Olivier Vauboin <po@lambdaconcept>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import argparse
 
diff --git a/litex/tools/litex_term.py b/litex/tools/litex_term.py
index 136dceba4..8408779d6 100755
--- a/litex/tools/litex_term.py
+++ b/litex/tools/litex_term.py
@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
 
-# This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
-# This file is Copyright (c) 2015 Sebastien Bourdeauducq <sb@m-labs.hk>
-# This file is Copyright (c) 2016 whitequark <whitequark@whitequark.org>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
+# Copyright (c) 2015 Sebastien Bourdeauducq <sb@m-labs.hk>
+# Copyright (c) 2016 whitequark <whitequark@whitequark.org>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import sys
 import signal
diff --git a/litex/tools/remote/comm_pcie.py b/litex/tools/remote/comm_pcie.py
index 6f477b023..52c937d95 100644
--- a/litex/tools/remote/comm_pcie.py
+++ b/litex/tools/remote/comm_pcie.py
@@ -1,5 +1,8 @@
-# This file is Copyright (c) 2015-2020 Florent Kermarrec <florent@enjoy-digital.fr>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2015-2020 Florent Kermarrec <florent@enjoy-digital.fr>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import os
 import ctypes
diff --git a/litex/tools/remote/comm_uart.py b/litex/tools/remote/comm_uart.py
index 2ab3444b7..7fd08cde4 100644
--- a/litex/tools/remote/comm_uart.py
+++ b/litex/tools/remote/comm_uart.py
@@ -1,5 +1,8 @@
-# This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import serial
 import struct
diff --git a/litex/tools/remote/comm_udp.py b/litex/tools/remote/comm_udp.py
index 60794c9c3..388737903 100644
--- a/litex/tools/remote/comm_udp.py
+++ b/litex/tools/remote/comm_udp.py
@@ -1,6 +1,9 @@
-# This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
-# This file is Copyright (c) 2016 Tim 'mithro' Ansell <mithro@mithis.com>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
+# Copyright (c) 2016 Tim 'mithro' Ansell <mithro@mithis.com>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import socket
 
diff --git a/litex/tools/remote/comm_usb.py b/litex/tools/remote/comm_usb.py
index 7205252fc..87432dfac 100644
--- a/litex/tools/remote/comm_usb.py
+++ b/litex/tools/remote/comm_usb.py
@@ -1,5 +1,8 @@
-# This file is Copyright (c) 2019 Sean Cross <sean@xobs.io>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2019 Sean Cross <sean@xobs.io>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import usb.core
 import time
diff --git a/litex/tools/remote/csr_builder.py b/litex/tools/remote/csr_builder.py
index c798052d3..011784216 100644
--- a/litex/tools/remote/csr_builder.py
+++ b/litex/tools/remote/csr_builder.py
@@ -1,6 +1,9 @@
-# This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
-# This file is Copyright (c) 2016 Tim 'mithro' Ansell <mithro@mithis.com>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
+# Copyright (c) 2016 Tim 'mithro' Ansell <mithro@mithis.com>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import csv
 
diff --git a/litex/tools/remote/etherbone.py b/litex/tools/remote/etherbone.py
index 43af3dc3b..cd955b4c0 100644
--- a/litex/tools/remote/etherbone.py
+++ b/litex/tools/remote/etherbone.py
@@ -1,6 +1,9 @@
-# This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
-# This file is Copyright (c) 2017 Tim Ansell <mithro@mithis.com>
-# License: BSD
+#
+# This file is part of LiteX.
+#
+# Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
+# Copyright (c) 2017 Tim Ansell <mithro@mithis.com>
+# SPDX-License-Identifier: BSD-2-Clause
 
 import math
 import struct