license: LGPL-2.1+ -> LGPL-2.1-or-later

180 files changed, 180 insertions, 180 deletions

diff --git a/src/network/fuzz-netdev-parser.c b/src/network/fuzz-netdev-parser.c
index 78c8d0c2b5..ddabe1c27b 100644
--- a/src/network/fuzz-netdev-parser.c
+++ b/src/network/fuzz-netdev-parser.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "fd-util.h"
 #include "fs-util.h"
diff --git a/src/network/fuzz-network-parser.c b/src/network/fuzz-network-parser.c
index 732b5b21f4..1292ebacd1 100644
--- a/src/network/fuzz-network-parser.c
+++ b/src/network/fuzz-network-parser.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "fd-util.h"
 #include "fs-util.h"
diff --git a/src/network/generator/main.c b/src/network/generator/main.c
index 61a741e5d2..f9cace70f7 100644
--- a/src/network/generator/main.c
+++ b/src/network/generator/main.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
 
diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
index 465b3eddc2..2fa21a067a 100644
--- a/src/network/generator/network-generator.c
+++ b/src/network/generator/network-generator.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "ether-addr-util.h"
 #include "fd-util.h"
diff --git a/src/network/generator/network-generator.h b/src/network/generator/network-generator.h
index 3d75b132de..86bcaec119 100644
--- a/src/network/generator/network-generator.h
+++ b/src/network/generator/network-generator.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <net/ethernet.h>
diff --git a/src/network/generator/test-network-generator.c b/src/network/generator/test-network-generator.c
index efcbdefda0..e658d89333 100644
--- a/src/network/generator/test-network-generator.c
+++ b/src/network/generator/test-network-generator.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "macro.h"
 #include "network-generator.h"
diff --git a/src/network/meson.build b/src/network/meson.build
index c2a197162f..cd1a897199 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
 sources = files('''
         netdev/bareudp.c
diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c
index 03c3ce5311..22c0e49d94 100644
--- a/src/network/netdev/bareudp.c
+++ b/src/network/netdev/bareudp.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
 #include "bareudp.h"
diff --git a/src/network/netdev/bareudp.h b/src/network/netdev/bareudp.h
index 105475038d..ea80bbf800 100644
--- a/src/network/netdev/bareudp.h
+++ b/src/network/netdev/bareudp.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
index 3007d6913a..8c777b3a06 100644
--- a/src/network/netdev/bond.c
+++ b/src/network/netdev/bond.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
 #include "bond.h"
diff --git a/src/network/netdev/bond.h b/src/network/netdev/bond.h
index 64b2dd04a2..11d3e9ba26 100644
--- a/src/network/netdev/bond.h
+++ b/src/network/netdev/bond.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <netinet/in.h>
diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
index 45d97ac15e..1f59cd8b42 100644
--- a/src/network/netdev/bridge.c
+++ b/src/network/netdev/bridge.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 
diff --git a/src/network/netdev/bridge.h b/src/network/netdev/bridge.h
index ed4f484c94..d6abda99e8 100644
--- a/src/network/netdev/bridge.h
+++ b/src/network/netdev/bridge.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <netinet/in.h>
diff --git a/src/network/netdev/dummy.c b/src/network/netdev/dummy.c
index e06dc02f3a..754ee98952 100644
--- a/src/network/netdev/dummy.c
+++ b/src/network/netdev/dummy.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "dummy.h"
 
diff --git a/src/network/netdev/dummy.h b/src/network/netdev/dummy.h
index f935414772..eafdf4b5bf 100644
--- a/src/network/netdev/dummy.h
+++ b/src/network/netdev/dummy.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "netdev.h"
diff --git a/src/network/netdev/fou-tunnel.c b/src/network/netdev/fou-tunnel.c
index 832cf57dea..6863257a58 100644
--- a/src/network/netdev/fou-tunnel.c
+++ b/src/network/netdev/fou-tunnel.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/fou.h>
 #include <net/if.h>
diff --git a/src/network/netdev/fou-tunnel.h b/src/network/netdev/fou-tunnel.h
index caa3b7600e..a6f10dfca4 100644
--- a/src/network/netdev/fou-tunnel.h
+++ b/src/network/netdev/fou-tunnel.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <netinet/in.h>
diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c
index b4f865a538..edf92ec93c 100644
--- a/src/network/netdev/geneve.c
+++ b/src/network/netdev/geneve.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 
diff --git a/src/network/netdev/geneve.h b/src/network/netdev/geneve.h
index 2ac3c1e835..b62eb7b76d 100644
--- a/src/network/netdev/geneve.h
+++ b/src/network/netdev/geneve.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct Geneve Geneve;
diff --git a/src/network/netdev/ifb.c b/src/network/netdev/ifb.c
index 7736a162f9..16ff49d7f0 100644
--- a/src/network/netdev/ifb.c
+++ b/src/network/netdev/ifb.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #include "ifb.h"
diff --git a/src/network/netdev/ifb.h b/src/network/netdev/ifb.h
index 761d215894..badfb4ad10 100644
--- a/src/network/netdev/ifb.h
+++ b/src/network/netdev/ifb.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #pragma once
diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c
index bd14f625de..92a8f583e3 100644
--- a/src/network/netdev/ipvlan.c
+++ b/src/network/netdev/ipvlan.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 
diff --git a/src/network/netdev/ipvlan.h b/src/network/netdev/ipvlan.h
index 8e658184ff..633b0bd94f 100644
--- a/src/network/netdev/ipvlan.h
+++ b/src/network/netdev/ipvlan.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <netinet/in.h>
diff --git a/src/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c
index 949f124ccd..eeea19764e 100644
--- a/src/network/netdev/l2tp-tunnel.c
+++ b/src/network/netdev/l2tp-tunnel.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <linux/l2tp.h>
diff --git a/src/network/netdev/l2tp-tunnel.h b/src/network/netdev/l2tp-tunnel.h
index d314b98703..048318d6df 100644
--- a/src/network/netdev/l2tp-tunnel.h
+++ b/src/network/netdev/l2tp-tunnel.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <netinet/in.h>
diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
index e84a18ffae..82e71c3920 100644
--- a/src/network/netdev/macsec.c
+++ b/src/network/netdev/macsec.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <linux/if_ether.h>
diff --git a/src/network/netdev/macsec.h b/src/network/netdev/macsec.h
index 26ad2b7cca..4d88e49514 100644
--- a/src/network/netdev/macsec.h
+++ b/src/network/netdev/macsec.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <netinet/in.h>
diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c
index 8f38217789..9bdcf627b4 100644
--- a/src/network/netdev/macvlan.c
+++ b/src/network/netdev/macvlan.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 
diff --git a/src/network/netdev/macvlan.h b/src/network/netdev/macvlan.h
index 7bc6eef12d..cb7eece67f 100644
--- a/src/network/netdev/macvlan.h
+++ b/src/network/netdev/macvlan.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct MacVlan MacVlan;
diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index 7bbc5ad3c2..ba9039006b 100644
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h
index 0ab9a8e3f3..468fae591c 100644
--- a/src/network/netdev/netdev.h
+++ b/src/network/netdev/netdev.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "sd-netlink.h"
diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c
index bfd2a16035..b2814284a4 100644
--- a/src/network/netdev/netdevsim.c
+++ b/src/network/netdev/netdevsim.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "netdevsim.h"
 
diff --git a/src/network/netdev/netdevsim.h b/src/network/netdev/netdevsim.h
index 4622f4a0c5..27adc594ad 100644
--- a/src/network/netdev/netdevsim.h
+++ b/src/network/netdev/netdevsim.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct NetDevSim NetDevSim;
diff --git a/src/network/netdev/nlmon.c b/src/network/netdev/nlmon.c
index 30e49a55ab..a8faed5b24 100644
--- a/src/network/netdev/nlmon.c
+++ b/src/network/netdev/nlmon.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "nlmon.h"
 
diff --git a/src/network/netdev/nlmon.h b/src/network/netdev/nlmon.h
index b5f65f6140..edfc504bca 100644
--- a/src/network/netdev/nlmon.h
+++ b/src/network/netdev/nlmon.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct NLMon NLMon;
diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
index 852aa423b6..66e8868284 100644
--- a/src/network/netdev/tunnel.c
+++ b/src/network/netdev/tunnel.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <linux/fou.h>
diff --git a/src/network/netdev/tunnel.h b/src/network/netdev/tunnel.h
index 6480d93e65..d58ded757d 100644
--- a/src/network/netdev/tunnel.h
+++ b/src/network/netdev/tunnel.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "in-addr-util.h"
diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c
index aef72e7bbb..d9d654495e 100644
--- a/src/network/netdev/tuntap.c
+++ b/src/network/netdev/tuntap.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/network/netdev/tuntap.h b/src/network/netdev/tuntap.h
index 8a80b633da..4d1e643f43 100644
--- a/src/network/netdev/tuntap.h
+++ b/src/network/netdev/tuntap.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct TunTap TunTap;
diff --git a/src/network/netdev/vcan.c b/src/network/netdev/vcan.c
index 9a0f87b1e1..3621d4c5d8 100644
--- a/src/network/netdev/vcan.c
+++ b/src/network/netdev/vcan.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "vcan.h"
 
diff --git a/src/network/netdev/vcan.h b/src/network/netdev/vcan.h
index d8af07e3ce..843984fbee 100644
--- a/src/network/netdev/vcan.h
+++ b/src/network/netdev/vcan.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct VCan VCan;
diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c
index 8c7c1d053f..840a3277b1 100644
--- a/src/network/netdev/veth.c
+++ b/src/network/netdev/veth.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
 #include <net/if.h>
diff --git a/src/network/netdev/veth.h b/src/network/netdev/veth.h
index 6a0728b1c4..643f737a88 100644
--- a/src/network/netdev/veth.h
+++ b/src/network/netdev/veth.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct Veth Veth;
diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c
index a4c7192c7d..e7f03f06f0 100644
--- a/src/network/netdev/vlan.c
+++ b/src/network/netdev/vlan.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
 #include <net/if.h>
diff --git a/src/network/netdev/vlan.h b/src/network/netdev/vlan.h
index 7f6cb14787..9dff924cd0 100644
--- a/src/network/netdev/vlan.h
+++ b/src/network/netdev/vlan.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct VLan VLan;
diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c
index a8ed3fadcb..ae71ae916c 100644
--- a/src/network/netdev/vrf.c
+++ b/src/network/netdev/vrf.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 
diff --git a/src/network/netdev/vrf.h b/src/network/netdev/vrf.h
index a0bff913bd..87977e230c 100644
--- a/src/network/netdev/vrf.h
+++ b/src/network/netdev/vrf.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct Vrf Vrf;
diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c
index 9614af1068..e4e32ff390 100644
--- a/src/network/netdev/vxcan.c
+++ b/src/network/netdev/vxcan.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/can/vxcan.h>
 
diff --git a/src/network/netdev/vxcan.h b/src/network/netdev/vxcan.h
index 4531a67370..47be3f017d 100644
--- a/src/network/netdev/vxcan.h
+++ b/src/network/netdev/vxcan.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct VxCan VxCan;
diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c
index d941b7d633..6748f67f8f 100644
--- a/src/network/netdev/vxlan.c
+++ b/src/network/netdev/vxlan.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 
diff --git a/src/network/netdev/vxlan.h b/src/network/netdev/vxlan.h
index d836215c46..371653cade 100644
--- a/src/network/netdev/vxlan.h
+++ b/src/network/netdev/vxlan.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 typedef struct VxLan VxLan;
diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
index e7683892a5..416e9b92d1 100644
--- a/src/network/netdev/wireguard.c
+++ b/src/network/netdev/wireguard.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /***
   Copyright © 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
 ***/
diff --git a/src/network/netdev/wireguard.h b/src/network/netdev/wireguard.h
index e2c06f0377..b9b5ae9871 100644
--- a/src/network/netdev/wireguard.h
+++ b/src/network/netdev/wireguard.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/network/netdev/xfrm.c b/src/network/netdev/xfrm.c
index ff8ff35689..a407c54da4 100644
--- a/src/network/netdev/xfrm.c
+++ b/src/network/netdev/xfrm.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "missing_network.h"
 #include "xfrm.h"
diff --git a/src/network/netdev/xfrm.h b/src/network/netdev/xfrm.h
index 889d3619b1..f56c4f272a 100644
--- a/src/network/netdev/xfrm.h
+++ b/src/network/netdev/xfrm.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "netdev.h"
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 142ffc33e1..63a90bc13d 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <arpa/inet.h>
 #include <getopt.h>
diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c
index 66b192256e..f933a1da94 100644
--- a/src/network/networkd-address-label.c
+++ b/src/network/networkd-address-label.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 #include <linux/if_addrlabel.h>
diff --git a/src/network/networkd-address-label.h b/src/network/networkd-address-label.h
index b92828c72e..11fdd9abfe 100644
--- a/src/network/networkd-address-label.h
+++ b/src/network/networkd-address-label.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <inttypes.h>
diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c
index c732b6c56e..7e27db6611 100644
--- a/src/network/networkd-address-pool.c
+++ b/src/network/networkd-address-pool.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
 #include "networkd-address-pool.h"
diff --git a/src/network/networkd-address-pool.h b/src/network/networkd-address-pool.h
index c53fe7407f..93bdec82e3 100644
--- a/src/network/networkd-address-pool.h
+++ b/src/network/networkd-address-pool.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "in-addr-util.h"
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index d24104d55a..bc09e3c403 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 #include <net/if_arp.h>
diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h
index 0104747d9a..56e81da822 100644
--- a/src/network/networkd-address.h
+++ b/src/network/networkd-address.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <inttypes.h>
diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
index 23ca4f9fac..e53c73c30c 100644
--- a/src/network/networkd-brvlan.c
+++ b/src/network/networkd-brvlan.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /***
   Copyright © 2016 BISDN GmbH. All rights reserved.
 ***/
diff --git a/src/network/networkd-brvlan.h b/src/network/networkd-brvlan.h
index d13ea30151..938b7901f1 100644
--- a/src/network/networkd-brvlan.h
+++ b/src/network/networkd-brvlan.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/network/networkd-can.c b/src/network/networkd-can.c
index e5504f7738..7e31d2fc82 100644
--- a/src/network/networkd-can.c
+++ b/src/network/networkd-can.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 #include <linux/can/netlink.h>
diff --git a/src/network/networkd-can.h b/src/network/networkd-can.h
index 30e99b189d..7a2705bf9a 100644
--- a/src/network/networkd-can.h
+++ b/src/network/networkd-can.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "conf-parser.h"
diff --git a/src/network/networkd-conf.c b/src/network/networkd-conf.c
index 233ef9f4f6..bf51624ec4 100644
--- a/src/network/networkd-conf.c
+++ b/src/network/networkd-conf.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /***
   Copyright © 2014 Vinay Kulkarni <kulkarniv@vmware.com>
  ***/
diff --git a/src/network/networkd-conf.h b/src/network/networkd-conf.h
index 88a2c64031..b485e9e541 100644
--- a/src/network/networkd-conf.h
+++ b/src/network/networkd-conf.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/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
index a41bd348dc..2537561265 100644
--- a/src/network/networkd-dhcp-common.c
+++ b/src/network/networkd-dhcp-common.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <linux/if_arp.h>
diff --git a/src/network/networkd-dhcp-common.h b/src/network/networkd-dhcp-common.h
index fc84450e5e..78c149ebcc 100644
--- a/src/network/networkd-dhcp-common.h
+++ b/src/network/networkd-dhcp-common.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "conf-parser.h"
diff --git a/src/network/networkd-dhcp-server-bus.c b/src/network/networkd-dhcp-server-bus.c
index 3de8c16d89..32f4baed78 100644
--- a/src/network/networkd-dhcp-server-bus.c
+++ b/src/network/networkd-dhcp-server-bus.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "sd-dhcp-server.h"
 
diff --git a/src/network/networkd-dhcp-server-bus.h b/src/network/networkd-dhcp-server-bus.h
index 49164ff0bb..7191478200 100644
--- a/src/network/networkd-dhcp-server-bus.h
+++ b/src/network/networkd-dhcp-server-bus.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.c b/src/network/networkd-dhcp-server.c
index 0155ab2de2..cf279c640d 100644
--- a/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <linux/if_arp.h>
diff --git a/src/network/networkd-dhcp-server.h b/src/network/networkd-dhcp-server.h
index 2250a30af4..4bd5120ea0 100644
--- a/src/network/networkd-dhcp-server.h
+++ b/src/network/networkd-dhcp-server.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "conf-parser.h"
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 319ef61593..02d33841b6 100644
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
diff --git a/src/network/networkd-dhcp4.h b/src/network/networkd-dhcp4.h
index 8aa6ac9453..daab5b1d7d 100644
--- a/src/network/networkd-dhcp4.h
+++ b/src/network/networkd-dhcp4.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "conf-parser.h"
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index e7dc10c2be..d4d4182ee5 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /***
   Copyright © 2014 Intel Corporation. All rights reserved.
 ***/
diff --git a/src/network/networkd-dhcp6.h b/src/network/networkd-dhcp6.h
index 4956c90915..65b35fd1e8 100644
--- a/src/network/networkd-dhcp6.h
+++ b/src/network/networkd-dhcp6.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "sd-dhcp6-client.h"
diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c
index 2e35f7d1bf..283dece04f 100644
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /***
   Copyright © 2014 Intel Corporation. All rights reserved.
 ***/
diff --git a/src/network/networkd-fdb.h b/src/network/networkd-fdb.h
index 935406e022..48f4e40b37 100644
--- a/src/network/networkd-fdb.h
+++ b/src/network/networkd-fdb.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/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c
index 2f4107580b..295abe866e 100644
--- a/src/network/networkd-ipv4ll.c
+++ b/src/network/networkd-ipv4ll.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <linux/if.h>
diff --git a/src/network/networkd-ipv4ll.h b/src/network/networkd-ipv4ll.h
index 4833e304b6..fae48cd921 100644
--- a/src/network/networkd-ipv4ll.h
+++ b/src/network/networkd-ipv4ll.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "conf-parser.h"
diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c
index ce193c0e50..0b57c6c4db 100644
--- a/src/network/networkd-ipv6-proxy-ndp.c
+++ b/src/network/networkd-ipv6-proxy-ndp.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <linux/if.h>
diff --git a/src/network/networkd-ipv6-proxy-ndp.h b/src/network/networkd-ipv6-proxy-ndp.h
index e58b17ec94..27313efa0c 100644
--- a/src/network/networkd-ipv6-proxy-ndp.h
+++ b/src/network/networkd-ipv6-proxy-ndp.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "conf-parser.h"
diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 072dfac93d..9f4c719e31 100644
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/src/network/networkd-link-bus.h b/src/network/networkd-link-bus.h
index 94474f22ff..45594dfac9 100644
--- a/src/network/networkd-link-bus.h
+++ b/src/network/networkd-link-bus.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-link.c b/src/network/networkd-link.c
index 1eca07771a..ced18de425 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <linux/if.h>
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 159e7e705b..cd541920cb 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <endian.h>
diff --git a/src/network/networkd-lldp-rx.c b/src/network/networkd-lldp-rx.c
index 4d431ac840..c22852ff50 100644
--- a/src/network/networkd-lldp-rx.c
+++ b/src/network/networkd-lldp-rx.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 #include <net/if_arp.h>
diff --git a/src/network/networkd-lldp-rx.h b/src/network/networkd-lldp-rx.h
index 8e1a6a0b62..78c522893b 100644
--- a/src/network/networkd-lldp-rx.h
+++ b/src/network/networkd-lldp-rx.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "conf-parser.h"
diff --git a/src/network/networkd-lldp-tx.c b/src/network/networkd-lldp-tx.c
index 4a1b5fb5f8..b03d948bd8 100644
--- a/src/network/networkd-lldp-tx.c
+++ b/src/network/networkd-lldp-tx.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <endian.h>
 #include <inttypes.h>
diff --git a/src/network/networkd-lldp-tx.h b/src/network/networkd-lldp-tx.h
index 1409984ac0..aae30cba0f 100644
--- a/src/network/networkd-lldp-tx.h
+++ b/src/network/networkd-lldp-tx.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <stdbool.h>
diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index 8dbcdff826..a0ac8b51fb 100644
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/src/network/networkd-manager-bus.h b/src/network/networkd-manager-bus.h
index e19d706927..08ddfbdb73 100644
--- a/src/network/networkd-manager-bus.h
+++ b/src/network/networkd-manager-bus.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-manager.c b/src/network/networkd-manager.c
index ff00d86509..e8b6615afa 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <sys/socket.h>
diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h
index ac7de58c64..b67116be59 100644
--- a/src/network/networkd-manager.h
+++ b/src/network/networkd-manager.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-mdb.c b/src/network/networkd-mdb.c
index bca3e620dd..0300dced62 100644
--- a/src/network/networkd-mdb.c
+++ b/src/network/networkd-mdb.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 
diff --git a/src/network/networkd-mdb.h b/src/network/networkd-mdb.h
index 563a9e6d99..ea8841275e 100644
--- a/src/network/networkd-mdb.h
+++ b/src/network/networkd-mdb.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <inttypes.h>
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index a61eaa9fc8..f4bea08070 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /***
   Copyright © 2014 Intel Corporation. All rights reserved.
 ***/
diff --git a/src/network/networkd-ndisc.h b/src/network/networkd-ndisc.h
index 4e9a704995..1562411224 100644
--- a/src/network/networkd-ndisc.h
+++ b/src/network/networkd-ndisc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "conf-parser.h"
diff --git a/src/network/networkd-neighbor.c b/src/network/networkd-neighbor.c
index b553f1707e..c805d52cf3 100644
--- a/src/network/networkd-neighbor.c
+++ b/src/network/networkd-neighbor.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
 #include "hashmap.h"
diff --git a/src/network/networkd-neighbor.h b/src/network/networkd-neighbor.h
index bb403ef2da..8ad790be2d 100644
--- a/src/network/networkd-neighbor.h
+++ b/src/network/networkd-neighbor.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <stdbool.h>
diff --git a/src/network/networkd-network-bus.c b/src/network/networkd-network-bus.c
index 70fddd56a5..0e5f1488d8 100644
--- a/src/network/networkd-network-bus.c
+++ b/src/network/networkd-network-bus.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-network-bus.h b/src/network/networkd-network-bus.h
index 650e145d42..cca1e0af33 100644
--- a/src/network/networkd-network-bus.h
+++ b/src/network/networkd-network-bus.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-network.c b/src/network/networkd-network.c
index 426dd0a8f0..75bf474e9b 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
index 92c7a4636f..fd0fe056b2 100644
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <linux/nl80211.h>
diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c
index 6edeaabf88..4a09b4c912 100644
--- a/src/network/networkd-nexthop.c
+++ b/src/network/networkd-nexthop.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc.
  */
 
diff --git a/src/network/networkd-nexthop.h b/src/network/networkd-nexthop.h
index 3cdb068efd..75714e7ef5 100644
--- a/src/network/networkd-nexthop.h
+++ b/src/network/networkd-nexthop.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc.
  */
 
diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
index a4162cf874..817c15764a 100644
--- a/src/network/networkd-radv.c
+++ b/src/network/networkd-radv.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /***
   Copyright © 2017 Intel Corporation. All rights reserved.
 ***/
diff --git a/src/network/networkd-radv.h b/src/network/networkd-radv.h
index 75c606d15e..4dfbefef95 100644
--- a/src/network/networkd-radv.h
+++ b/src/network/networkd-radv.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/network/networkd-route.c b/src/network/networkd-route.c
index cd0f0aa707..10f30c1a7e 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/icmpv6.h>
 #include <linux/ipv6_route.h>
diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h
index e896719e13..f59369392f 100644
--- a/src/network/networkd-route.h
+++ b/src/network/networkd-route.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <inttypes.h>
diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c
index de60bd9555..a31fb31fa4 100644
--- a/src/network/networkd-routing-policy-rule.c
+++ b/src/network/networkd-routing-policy-rule.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/if.h>
 #include <linux/fib_rules.h>
diff --git a/src/network/networkd-routing-policy-rule.h b/src/network/networkd-routing-policy-rule.h
index bc1193a111..baf086f25e 100644
--- a/src/network/networkd-routing-policy-rule.h
+++ b/src/network/networkd-routing-policy-rule.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <inttypes.h>
diff --git a/src/network/networkd-speed-meter.c b/src/network/networkd-speed-meter.c
index ecf0346344..e7f0682c3e 100644
--- a/src/network/networkd-speed-meter.c
+++ b/src/network/networkd-speed-meter.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
 
diff --git a/src/network/networkd-speed-meter.h b/src/network/networkd-speed-meter.h
index f5727784a9..4dd024b62a 100644
--- a/src/network/networkd-speed-meter.h
+++ b/src/network/networkd-speed-meter.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 /* Default interval is 10sec. The speed meter periodically make networkd
diff --git a/src/network/networkd-sriov.c b/src/network/networkd-sriov.c
index 61382a8993..68f43b5ce6 100644
--- a/src/network/networkd-sriov.c
+++ b/src/network/networkd-sriov.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
 #include "alloc-util.h"
diff --git a/src/network/networkd-sriov.h b/src/network/networkd-sriov.h
index 8a48545d64..dae5ff0306 100644
--- a/src/network/networkd-sriov.h
+++ b/src/network/networkd-sriov.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c
index b6839f86ee..518fe8e131 100644
--- a/src/network/networkd-sysctl.c
+++ b/src/network/networkd-sysctl.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <linux/if.h>
diff --git a/src/network/networkd-sysctl.h b/src/network/networkd-sysctl.h
index 552b55226a..3568900a1f 100644
--- a/src/network/networkd-sysctl.h
+++ b/src/network/networkd-sysctl.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <stdbool.h>
diff --git a/src/network/networkd-util.c b/src/network/networkd-util.c
index bae4ee5cba..8ddcbb2fce 100644
--- a/src/network/networkd-util.c
+++ b/src/network/networkd-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "condition.h"
 #include "conf-parser.h"
diff --git a/src/network/networkd-util.h b/src/network/networkd-util.h
index ce169fa731..6100a0031c 100644
--- a/src/network/networkd-util.h
+++ b/src/network/networkd-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "sd-dhcp-lease.h"
diff --git a/src/network/networkd-wifi.c b/src/network/networkd-wifi.c
index 53b65286b3..0f2def7a16 100644
--- a/src/network/networkd-wifi.c
+++ b/src/network/networkd-wifi.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <net/ethernet.h>
 #include <linux/nl80211.h>
diff --git a/src/network/networkd-wifi.h b/src/network/networkd-wifi.h
index 57aa153370..ab868eba27 100644
--- a/src/network/networkd-wifi.h
+++ b/src/network/networkd-wifi.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.c b/src/network/networkd.c
index f78ff9db54..b448d9b011 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
 #include <sys/stat.h>
diff --git a/src/network/org.freedesktop.network1.policy b/src/network/org.freedesktop.network1.policy
index 50b0ef0814..9e27f728bc 100644
--- a/src/network/org.freedesktop.network1.policy
+++ b/src/network/org.freedesktop.network1.policy
@@ -3,7 +3,7 @@
         "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
 
 <!--
-  SPDX-License-Identifier: LGPL-2.1+
+  SPDX-License-Identifier: LGPL-2.1-or-later
 
   This file is part of systemd.
 
diff --git a/src/network/org.freedesktop.network1.service b/src/network/org.freedesktop.network1.service
index 641a1a5cc1..ddbf3eb4ee 100644
--- a/src/network/org.freedesktop.network1.service
+++ b/src/network/org.freedesktop.network1.service
@@ -1,4 +1,4 @@
-#  SPDX-License-Identifier: LGPL-2.1+
+#  SPDX-License-Identifier: LGPL-2.1-or-later
 #
 #  This file is part of systemd.
 #
diff --git a/src/network/tc/cake.c b/src/network/tc/cake.c
index 1da1ec40c3..76fb718f9c 100644
--- a/src/network/tc/cake.c
+++ b/src/network/tc/cake.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/cake.h b/src/network/tc/cake.h
index 36de5110dd..1da28b7d20 100644
--- a/src/network/tc/cake.h
+++ b/src/network/tc/cake.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/codel.c b/src/network/tc/codel.c
index cba6faf376..807c247b57 100644
--- a/src/network/tc/codel.c
+++ b/src/network/tc/codel.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/codel.h b/src/network/tc/codel.h
index 4023a7dee5..4fe52831a0 100644
--- a/src/network/tc/codel.h
+++ b/src/network/tc/codel.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/drr.c b/src/network/tc/drr.c
index 9810a120d1..86b7f43311 100644
--- a/src/network/tc/drr.c
+++ b/src/network/tc/drr.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/drr.h b/src/network/tc/drr.h
index ff2b658acc..c96cc4db00 100644
--- a/src/network/tc/drr.h
+++ b/src/network/tc/drr.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/ets.c b/src/network/tc/ets.c
index ece1f369d5..8214a575bf 100644
--- a/src/network/tc/ets.c
+++ b/src/network/tc/ets.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/pkt_sched.h>
 
diff --git a/src/network/tc/ets.h b/src/network/tc/ets.h
index c35d5976d8..b6dd42811c 100644
--- a/src/network/tc/ets.h
+++ b/src/network/tc/ets.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/fifo.c b/src/network/tc/fifo.c
index e955223a89..8b1fa6ee40 100644
--- a/src/network/tc/fifo.c
+++ b/src/network/tc/fifo.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/fifo.h b/src/network/tc/fifo.h
index e4c976b942..b9bbd0994c 100644
--- a/src/network/tc/fifo.h
+++ b/src/network/tc/fifo.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/fq-codel.c b/src/network/tc/fq-codel.c
index 17a2915143..958f65a28b 100644
--- a/src/network/tc/fq-codel.c
+++ b/src/network/tc/fq-codel.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/fq-codel.h b/src/network/tc/fq-codel.h
index 1a80963df6..2553c59886 100644
--- a/src/network/tc/fq-codel.h
+++ b/src/network/tc/fq-codel.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/fq-pie.c b/src/network/tc/fq-pie.c
index 3065ac0150..c7d7623b47 100644
--- a/src/network/tc/fq-pie.c
+++ b/src/network/tc/fq-pie.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/fq-pie.h b/src/network/tc/fq-pie.h
index 8de9593c44..51fb626a7a 100644
--- a/src/network/tc/fq-pie.h
+++ b/src/network/tc/fq-pie.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/fq.c b/src/network/tc/fq.c
index d3218203b9..d48aea86fb 100644
--- a/src/network/tc/fq.c
+++ b/src/network/tc/fq.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/fq.h b/src/network/tc/fq.h
index 5a8ed6d651..77469c4103 100644
--- a/src/network/tc/fq.h
+++ b/src/network/tc/fq.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/gred.c b/src/network/tc/gred.c
index 7c9e01aba7..46a9eadf87 100644
--- a/src/network/tc/gred.c
+++ b/src/network/tc/gred.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/gred.h b/src/network/tc/gred.h
index 4fb2b37c11..c084ff12ec 100644
--- a/src/network/tc/gred.h
+++ b/src/network/tc/gred.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/hhf.c b/src/network/tc/hhf.c
index 324a975aa8..69c02f4810 100644
--- a/src/network/tc/hhf.c
+++ b/src/network/tc/hhf.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/hhf.h b/src/network/tc/hhf.h
index a555998eee..04caaa8aa4 100644
--- a/src/network/tc/hhf.h
+++ b/src/network/tc/hhf.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/htb.c b/src/network/tc/htb.c
index 65481a76bc..0969587c40 100644
--- a/src/network/tc/htb.c
+++ b/src/network/tc/htb.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/pkt_sched.h>
 
diff --git a/src/network/tc/htb.h b/src/network/tc/htb.h
index b385872e0a..55644dbdd2 100644
--- a/src/network/tc/htb.h
+++ b/src/network/tc/htb.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "conf-parser.h"
diff --git a/src/network/tc/netem.c b/src/network/tc/netem.c
index a94a9a369e..454e556d2e 100644
--- a/src/network/tc/netem.c
+++ b/src/network/tc/netem.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/netem.h b/src/network/tc/netem.h
index 6319c72521..d58d5ac765 100644
--- a/src/network/tc/netem.h
+++ b/src/network/tc/netem.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/pie.c b/src/network/tc/pie.c
index eccbaa2cf5..695a38171d 100644
--- a/src/network/tc/pie.c
+++ b/src/network/tc/pie.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/pie.h b/src/network/tc/pie.h
index 7c764742ad..40a114e7d1 100644
--- a/src/network/tc/pie.h
+++ b/src/network/tc/pie.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c
index 619a2f4b98..2add12816a 100644
--- a/src/network/tc/qdisc.c
+++ b/src/network/tc/qdisc.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/qdisc.h b/src/network/tc/qdisc.h
index a92460faf9..f9a9954861 100644
--- a/src/network/tc/qdisc.h
+++ b/src/network/tc/qdisc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/qfq.c b/src/network/tc/qfq.c
index 2104067f3b..320f2c1c52 100644
--- a/src/network/tc/qfq.c
+++ b/src/network/tc/qfq.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/qfq.h b/src/network/tc/qfq.h
index 10bab3e642..0f013a9863 100644
--- a/src/network/tc/qfq.h
+++ b/src/network/tc/qfq.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/sfb.c b/src/network/tc/sfb.c
index 3692a50ed8..674fdf6ac7 100644
--- a/src/network/tc/sfb.c
+++ b/src/network/tc/sfb.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/sfb.h b/src/network/tc/sfb.h
index 3cc87d7373..628df358e8 100644
--- a/src/network/tc/sfb.h
+++ b/src/network/tc/sfb.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2020 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/sfq.c b/src/network/tc/sfq.c
index d671281c46..387be83a99 100644
--- a/src/network/tc/sfq.c
+++ b/src/network/tc/sfq.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/sfq.h b/src/network/tc/sfq.h
index 19c8decf13..1626775d63 100644
--- a/src/network/tc/sfq.h
+++ b/src/network/tc/sfq.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/tbf.c b/src/network/tc/tbf.c
index cb3c3bcc15..2d84c5a833 100644
--- a/src/network/tc/tbf.c
+++ b/src/network/tc/tbf.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/tbf.h b/src/network/tc/tbf.h
index a785be25e0..6b4b017c7c 100644
--- a/src/network/tc/tbf.h
+++ b/src/network/tc/tbf.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/tc-util.c b/src/network/tc/tc-util.c
index 8a5afeab2d..3e10b50c96 100644
--- a/src/network/tc/tc-util.c
+++ b/src/network/tc/tc-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #include "alloc-util.h"
diff --git a/src/network/tc/tc-util.h b/src/network/tc/tc-util.h
index 6287b35a76..83bad8e3b7 100644
--- a/src/network/tc/tc-util.h
+++ b/src/network/tc/tc-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/tc.c b/src/network/tc/tc.c
index 974bb8c822..c32b040919 100644
--- a/src/network/tc/tc.c
+++ b/src/network/tc/tc.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "macro.h"
 #include "qdisc.h"
diff --git a/src/network/tc/tc.h b/src/network/tc/tc.h
index 916ad3300a..7fbd744142 100644
--- a/src/network/tc/tc.h
+++ b/src/network/tc/tc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "networkd-link.h"
diff --git a/src/network/tc/tclass.c b/src/network/tc/tclass.c
index 9a39713b32..21b26b01a0 100644
--- a/src/network/tc/tclass.c
+++ b/src/network/tc/tclass.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 
 #include <linux/pkt_sched.h>
diff --git a/src/network/tc/tclass.h b/src/network/tc/tclass.h
index dc6886ac3f..f02a6a734a 100644
--- a/src/network/tc/tclass.h
+++ b/src/network/tc/tclass.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright © 2019 VMware, Inc. */
 #pragma once
 
diff --git a/src/network/tc/teql.c b/src/network/tc/teql.c
index f727d14341..0da2fc357e 100644
--- a/src/network/tc/teql.c
+++ b/src/network/tc/teql.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "macro.h"
 #include "netlink-util.h"
diff --git a/src/network/tc/teql.h b/src/network/tc/teql.h
index 5b091aaf0f..8d0085ea54 100644
--- a/src/network/tc/teql.h
+++ b/src/network/tc/teql.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "conf-parser.h"
diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c
index 7743c63d4a..475cac7527 100644
--- a/src/network/test-network-tables.c
+++ b/src/network/test-network-tables.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "bond.h"
 #include "dhcp6-internal.h"
diff --git a/src/network/test-network.c b/src/network/test-network.c
index f6168fc3fa..bb67c74e9b 100644
--- a/src/network/test-network.c
+++ b/src/network/test-network.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <arpa/inet.h>
 #include <sys/param.h>
diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c
index 030e50688a..0fe81886bd 100644
--- a/src/network/test-networkd-conf.c
+++ b/src/network/test-networkd-conf.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "ether-addr-util.h"
 #include "hexdecoct.h"
diff --git a/src/network/test-routing-policy-rule.c b/src/network/test-routing-policy-rule.c
index 40341d6073..8d87cdf9c9 100644
--- a/src/network/test-routing-policy-rule.c
+++ b/src/network/test-routing-policy-rule.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/network/wait-online/link.c b/src/network/wait-online/link.c
index 69b0057707..529fc9f22a 100644
--- a/src/network/wait-online/link.c
+++ b/src/network/wait-online/link.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "sd-network.h"
 
diff --git a/src/network/wait-online/link.h b/src/network/wait-online/link.h
index 73d9f9cc3e..3aa8357293 100644
--- a/src/network/wait-online/link.h
+++ b/src/network/wait-online/link.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "sd-netlink.h"
diff --git a/src/network/wait-online/manager.c b/src/network/wait-online/manager.c
index e84eed46ac..79994bd49c 100644
--- a/src/network/wait-online/manager.c
+++ b/src/network/wait-online/manager.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/ether.h>
 #include <linux/if.h>
diff --git a/src/network/wait-online/manager.h b/src/network/wait-online/manager.h
index 7398783df7..f5e83532ae 100644
--- a/src/network/wait-online/manager.h
+++ b/src/network/wait-online/manager.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
 #include "sd-event.h"
diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
index cfd9093f1a..c2bdcd4907 100644
--- a/src/network/wait-online/wait-online.c
+++ b/src/network/wait-online/wait-online.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <getopt.h>
 #include <sys/stat.h>