diff --git a/src/core/bpf-foreign.c b/src/core/bpf-foreign.c
index 98655bda3c..27e5517519 100644
--- a/src/core/bpf-foreign.c
+++ b/src/core/bpf-foreign.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "bpf-foreign.h"
 #include "bpf-program.h"
diff --git a/src/core/bpf-foreign.h b/src/core/bpf-foreign.h
index 7704986e3e..9559cd7981 100644
--- a/src/core/bpf-foreign.h
+++ b/src/core/bpf-foreign.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #pragma once
 
diff --git a/src/core/bpf-socket-bind.c b/src/core/bpf-socket-bind.c
index 9983691575..e9c0a2f9bd 100644
--- a/src/core/bpf-socket-bind.c
+++ b/src/core/bpf-socket-bind.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #if BPF_FRAMEWORK
 #include <bpf/bpf.h>
diff --git a/src/core/bpf-socket-bind.h b/src/core/bpf-socket-bind.h
index c8c75adaf6..7d426df714 100644
--- a/src/core/bpf-socket-bind.h
+++ b/src/core/bpf-socket-bind.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "fdset.h"
diff --git a/src/core/bpf/restrict_ifaces/meson.build b/src/core/bpf/restrict_ifaces/meson.build
index 5bf024d42d..38f7dbbd51 100644
--- a/src/core/bpf/restrict_ifaces/meson.build
+++ b/src/core/bpf/restrict_ifaces/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
 if conf.get('BPF_FRAMEWORK') == 1
         restrict_ifaces_skel_h = custom_target(
diff --git a/src/core/bpf/socket_bind/meson.build b/src/core/bpf/socket_bind/meson.build
index 0ea8e5796d..f5cfc04b00 100644
--- a/src/core/bpf/socket_bind/meson.build
+++ b/src/core/bpf/socket_bind/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
 if conf.get('BPF_FRAMEWORK') == 1
         socket_bind_skel_h = custom_target(
diff --git a/src/core/restrict-ifaces.c b/src/core/restrict-ifaces.c
index 709f74929b..ea8033c318 100644
--- a/src/core/restrict-ifaces.c
+++ b/src/core/restrict-ifaces.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "fd-util.h"
 #include "restrict-ifaces.h"
diff --git a/src/core/restrict-ifaces.h b/src/core/restrict-ifaces.h
index be9e5224c3..6e7a824364 100644
--- a/src/core/restrict-ifaces.h
+++ b/src/core/restrict-ifaces.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "fdset.h"
diff --git a/src/login/logind-polkit.c b/src/login/logind-polkit.c
index d221bee8cd..e4efd64616 100644
--- a/src/login/logind-polkit.c
+++ b/src/login/logind-polkit.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "bus-polkit.h"
 #include "logind-polkit.h"
diff --git a/src/login/logind-polkit.h b/src/login/logind-polkit.h
index 8c124f834d..9ec01a3c45 100644
--- a/src/login/logind-polkit.h
+++ b/src/login/logind-polkit.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "sd-bus.h"
diff --git a/src/network/networkd-dhcp-server-static-lease.c b/src/network/networkd-dhcp-server-static-lease.c
index 0d73d320f0..0a9b7def25 100644
--- a/src/network/networkd-dhcp-server-static-lease.c
+++ b/src/network/networkd-dhcp-server-static-lease.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
 #include "ether-addr-util.h"
diff --git a/src/network/networkd-dhcp-server-static-lease.h b/src/network/networkd-dhcp-server-static-lease.h
index 81c3598e27..c2a9ad6bb1 100644
--- a/src/network/networkd-dhcp-server-static-lease.h
+++ b/src/network/networkd-dhcp-server-static-lease.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #pragma once
 
diff --git a/src/resolve/resolved-socket-graveyard.c b/src/resolve/resolved-socket-graveyard.c
index 471fe1d578..e659ae9183 100644
--- a/src/resolve/resolved-socket-graveyard.c
+++ b/src/resolve/resolved-socket-graveyard.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "resolved-socket-graveyard.h"
 
diff --git a/src/resolve/resolved-socket-graveyard.h b/src/resolve/resolved-socket-graveyard.h
index 9b13bb0482..50c6aad544 100644
--- a/src/resolve/resolved-socket-graveyard.h
+++ b/src/resolve/resolved-socket-graveyard.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct SocketGraveyard SocketGraveyard;
diff --git a/src/shared/bpf-link.c b/src/shared/bpf-link.c
index 720ed40395..85eab09032 100644
--- a/src/shared/bpf-link.c
+++ b/src/shared/bpf-link.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "bpf-dlopen.h"
 #include "bpf-link.h"
diff --git a/src/shared/bpf-link.h b/src/shared/bpf-link.h
index bb6ac60ac9..38aa080862 100644
--- a/src/shared/bpf-link.h
+++ b/src/shared/bpf-link.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #pragma once
 
diff --git a/src/test/test-bpf-foreign-programs.c b/src/test/test-bpf-foreign-programs.c
index bbf3916872..86e05e23ab 100644
--- a/src/test/test-bpf-foreign-programs.c
+++ b/src/test/test-bpf-foreign-programs.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
 #include <linux/bpf_insn.h>
diff --git a/tools/build-bpf-skel.py b/tools/build-bpf-skel.py
index b28766fa64..0752174611 100755
--- a/tools/build-bpf-skel.py
+++ b/tools/build-bpf-skel.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
 import argparse
 import logging
diff --git a/tools/meson-render-jinja2.py b/tools/meson-render-jinja2.py
index 063cb0eb27..b811a15493 100755
--- a/tools/meson-render-jinja2.py
+++ b/tools/meson-render-jinja2.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
 import jinja2
 import re