diff --git a/src/core/bpf-foreign.c b/src/core/bpf-foreign.c
index 98655bda3c6..27e5517519b 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 7704986e3e8..9559cd79812 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 99836915755..e9c0a2f9bd2 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 c8c75adaf6e..7d426df7147 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 5bf024d42de..38f7dbbd511 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 0ea8e5796db..f5cfc04b006 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 709f74929b2..ea8033c318c 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 be9e5224c39..6e7a8243641 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 d221bee8cda..e4efd646167 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 8c124f834dc..9ec01a3c45a 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 0d73d320f01..0a9b7def25f 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 81c3598e279..c2a9ad6bb12 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 471fe1d5788..e659ae91833 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 9b13bb0482d..50c6aad5448 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 720ed40395b..85eab090328 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 bb6ac60ac9f..38aa080862d 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 bbf39168722..86e05e23aba 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 b28766fa648..07521746110 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 063cb0eb27b..b811a154930 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