diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b91a748bc..5cdedf8d30 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# This file is only used for development (netdata in Clion)
# It can build netdata, but you are on your own...
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 7d90c6c57a..af112d7fad 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,5 +1,5 @@
<!--
-SPDX-License-Identifier: GPL-3.0+
+SPDX-License-Identifier: GPL-3.0-or-later
-->
# netdata contributors license agreement
diff --git a/Makefile.am b/Makefile.am
index 89e1ce3a28..3bac6a6262 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
#
# Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
AUTOMAKE_OPTIONS=foreign 1.10
ACLOCAL_AMFLAGS = -I build/m4
diff --git a/build/m4/ax_pthread.m4 b/build/m4/ax_pthread.m4
index a2639ce713..ba9ac28a57 100644
--- a/build/m4/ax_pthread.m4
+++ b/build/m4/ax_pthread.m4
@@ -56,7 +56,7 @@
# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
# Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
#
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#serial 21
diff --git a/charts.d/Makefile.am b/charts.d/Makefile.am
index a909816c58..573e7bcef4 100644
--- a/charts.d/Makefile.am
+++ b/charts.d/Makefile.am
@@ -1,6 +1,6 @@
#
# Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
diff --git a/charts.d/ap.chart.sh b/charts.d/ap.chart.sh
index ac8785ba90..ccc36120cd 100644
--- a/charts.d/ap.chart.sh
+++ b/charts.d/ap.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/apache.chart.sh b/charts.d/apache.chart.sh
index 84d4e1bf07..95876432f3 100644
--- a/charts.d/apache.chart.sh
+++ b/charts.d/apache.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/apcupsd.chart.sh b/charts.d/apcupsd.chart.sh
index a061bd0253..e26ef566aa 100644
--- a/charts.d/apcupsd.chart.sh
+++ b/charts.d/apcupsd.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/cpu_apps.chart.sh b/charts.d/cpu_apps.chart.sh
index 2d83db7bb3..869464afe6 100644
--- a/charts.d/cpu_apps.chart.sh
+++ b/charts.d/cpu_apps.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash disable=SC2154,SC1072,SC1073,SC2009,SC2162,SC2006,SC2002,SC2086,SC1117
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/cpufreq.chart.sh b/charts.d/cpufreq.chart.sh
index bad06d1c79..1fc6caabf2 100644
--- a/charts.d/cpufreq.chart.sh
+++ b/charts.d/cpufreq.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/example.chart.sh b/charts.d/example.chart.sh
index e4b88d9ef8..1562c597af 100644
--- a/charts.d/example.chart.sh
+++ b/charts.d/example.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/exim.chart.sh b/charts.d/exim.chart.sh
index eb36f329a6..8099a72496 100644
--- a/charts.d/exim.chart.sh
+++ b/charts.d/exim.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/hddtemp.chart.sh b/charts.d/hddtemp.chart.sh
index 62d74ce051..e90310981d 100644
--- a/charts.d/hddtemp.chart.sh
+++ b/charts.d/hddtemp.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/libreswan.chart.sh b/charts.d/libreswan.chart.sh
index 4cfc3c3f0e..6e29f8473b 100644
--- a/charts.d/libreswan.chart.sh
+++ b/charts.d/libreswan.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash disable=SC1117
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/load_average.chart.sh b/charts.d/load_average.chart.sh
index f984e57861..b30cb850f8 100644
--- a/charts.d/load_average.chart.sh
+++ b/charts.d/load_average.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash disable=SC2154,SC1072,SC1073,SC2009,SC2162,SC2006,SC2002,SC2086,SC1117
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/mem_apps.chart.sh b/charts.d/mem_apps.chart.sh
index ca79f60118..a13dc71f11 100644
--- a/charts.d/mem_apps.chart.sh
+++ b/charts.d/mem_apps.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash disable=SC2154,SC1072,SC1073,SC2009,SC2162,SC2006,SC2002,SC2086,SC1117
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/mysql.chart.sh b/charts.d/mysql.chart.sh
index 9008643a7a..37e8e2a7c0 100644
--- a/charts.d/mysql.chart.sh
+++ b/charts.d/mysql.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/nginx.chart.sh b/charts.d/nginx.chart.sh
index 8e7c2c6f5a..14dda0832a 100644
--- a/charts.d/nginx.chart.sh
+++ b/charts.d/nginx.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/nut.chart.sh b/charts.d/nut.chart.sh
index af9f63e1db..7e252f325e 100644
--- a/charts.d/nut.chart.sh
+++ b/charts.d/nut.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/opensips.chart.sh b/charts.d/opensips.chart.sh
index 6385717fa8..c227bd4f21 100644
--- a/charts.d/opensips.chart.sh
+++ b/charts.d/opensips.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash disable=SC1117,SC2154,SC2086
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/phpfpm.chart.sh b/charts.d/phpfpm.chart.sh
index ccf0eecdfd..1af7910bc7 100644
--- a/charts.d/phpfpm.chart.sh
+++ b/charts.d/phpfpm.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/postfix.chart.sh b/charts.d/postfix.chart.sh
index e0a7727d9e..8cb938ce1e 100644
--- a/charts.d/postfix.chart.sh
+++ b/charts.d/postfix.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash disable=SC1117
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/sensors.chart.sh b/charts.d/sensors.chart.sh
index ded1e0bee5..54368f1e03 100644
--- a/charts.d/sensors.chart.sh
+++ b/charts.d/sensors.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/squid.chart.sh b/charts.d/squid.chart.sh
index aaa58fed08..cf5d1d78a8 100644
--- a/charts.d/squid.chart.sh
+++ b/charts.d/squid.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash disable=SC2154
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/charts.d/tomcat.chart.sh b/charts.d/tomcat.chart.sh
index 18ec1f5ce0..294487b8b0 100644
--- a/charts.d/tomcat.chart.sh
+++ b/charts.d/tomcat.chart.sh
@@ -1,6 +1,6 @@
# shellcheck shell=bash
# no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 817d366d27..5b705a5945 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -1,6 +1,6 @@
#
# Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
diff --git a/configure.ac b/configure.ac
index b60419da01..b8db5b805b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
#
# Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
AC_PREREQ(2.60)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 431c413ede..8a94677d7b 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
dist_noinst_DATA = \
diff --git a/contrib/nc-backend.sh b/contrib/nc-backend.sh
index 2277faaa2b..089b21accf 100755
--- a/contrib/nc-backend.sh
+++ b/contrib/nc-backend.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
MODE="${1}"
MY_PORT="${2}"
diff --git a/diagrams/Makefile.am b/diagrams/Makefile.am
index 7a5eead69e..04f99c8fdc 100644
--- a/diagrams/Makefile.am
+++ b/diagrams/Makefile.am
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
dist_noinst_DATA = \
diff --git a/diagrams/build.sh b/diagrams/build.sh
index 6992b7689b..9b3963e58c 100755
--- a/diagrams/build.sh
+++ b/diagrams/build.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
path=$(dirname "$0")
cd "${path}" || exit 1
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c6ff159c45..82dc5947d6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# author : paulfantom
# Cross-arch building is achieved by specifying ARCH as a build parameter with `--build-arg` option.
diff --git a/docker/build.sh b/docker/build.sh
index 8613e30e62..5117e3dc64 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# Author : Pawel Krupa (paulfantom)
# Cross-arch docker build helper script
diff --git a/installer/functions.sh b/installer/functions.sh
index 6fe9e368c1..4db6961aec 100644
--- a/installer/functions.sh
+++ b/installer/functions.sh
@@ -1,5 +1,5 @@
# no shebang necessary - this is a library to be sourced
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# shellcheck disable=SC1091,SC1117,SC2002,SC2004,SC2034,SC2046,SC2059,SC2086,SC2129,SC2148,SC2154,SC2155,SC2162,SC2166,SC2181,SC2193
# make sure we have a UID
diff --git a/kickstart-static64.sh b/kickstart-static64.sh
index 5ebf37597e..1fe3603454 100755
--- a/kickstart-static64.sh
+++ b/kickstart-static64.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# shellcheck disable=SC1117,SC2016,SC2034,SC2039,SC2059,SC2086,SC2119,SC2120,SC2129,SC2162,SC2166,SC2181
umask 022
diff --git a/kickstart.sh b/kickstart.sh
index fd3a0329b8..b493802f2c 100755
--- a/kickstart.sh
+++ b/kickstart.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# Run me with:
#
diff --git a/makeself/Makefile.am b/makeself/Makefile.am
index 22e2d0298f..f6f9167a08 100644
--- a/makeself/Makefile.am
+++ b/makeself/Makefile.am
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
dist_noinst_DATA = \
diff --git a/makeself/build-x86_64-static.sh b/makeself/build-x86_64-static.sh
index 0220a27466..b0902512c6 100755
--- a/makeself/build-x86_64-static.sh
+++ b/makeself/build-x86_64-static.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
. $(dirname "$0")/../installer/functions.sh || exit 1
diff --git a/makeself/build.sh b/makeself/build.sh
index c306cf29f5..e8c1c9ddc7 100755
--- a/makeself/build.sh
+++ b/makeself/build.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# -----------------------------------------------------------------------------
# parse command line arguments
diff --git a/makeself/functions.sh b/makeself/functions.sh
index 6c589351fd..10b324deb8 100755
--- a/makeself/functions.sh
+++ b/makeself/functions.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# -----------------------------------------------------------------------------
diff --git a/makeself/install-alpine-packages.sh b/makeself/install-alpine-packages.sh
index 225f1d6d20..695be4d4f5 100755
--- a/makeself/install-alpine-packages.sh
+++ b/makeself/install-alpine-packages.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# this script should be running in alpine linux
# install the required packages
diff --git a/makeself/install-or-update.sh b/makeself/install-or-update.sh
index ce9ca62023..bfcbe720aa 100755
--- a/makeself/install-or-update.sh
+++ b/makeself/install-or-update.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
. $(dirname "${0}")/functions.sh
diff --git a/makeself/jobs/10-prepare-destination.install.sh b/makeself/jobs/10-prepare-destination.install.sh
index 815c48bca9..019732636b 100755
--- a/makeself/jobs/10-prepare-destination.install.sh
+++ b/makeself/jobs/10-prepare-destination.install.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
. $(dirname "${0}")/../functions.sh "${@}" || exit 1
diff --git a/makeself/jobs/50-bash-4.4.18.install.sh b/makeself/jobs/50-bash-4.4.18.install.sh
index 9a85d3672a..0007658257 100755
--- a/makeself/jobs/50-bash-4.4.18.install.sh
+++ b/makeself/jobs/50-bash-4.4.18.install.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
. $(dirname "${0}")/../functions.sh "${@}" || exit 1
diff --git a/makeself/jobs/50-curl-7.60.0.install.sh b/makeself/jobs/50-curl-7.60.0.install.sh
index 9c720560c7..2b5c8f1394 100755
--- a/makeself/jobs/50-curl-7.60.0.install.sh
+++ b/makeself/jobs/50-curl-7.60.0.install.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
. $(dirname "${0}")/../functions.sh "${@}" || exit 1
diff --git a/makeself/jobs/50-fping-4.0.install.sh b/makeself/jobs/50-fping-4.0.install.sh
index bb4073a27d..7928f1aa41 100755
--- a/makeself/jobs/50-fping-4.0.install.sh
+++ b/makeself/jobs/50-fping-4.0.install.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
. $(dirname "${0}")/../functions.sh "${@}" || exit 1
diff --git a/makeself/jobs/70-netdata-git.install.sh b/makeself/jobs/70-netdata-git.install.sh
index cb28dd080f..71ea0f63a5 100755
--- a/makeself/jobs/70-netdata-git.install.sh
+++ b/makeself/jobs/70-netdata-git.install.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
. ${NETDATA_MAKESELF_PATH}/functions.sh "${@}" || exit 1
diff --git a/makeself/jobs/99-makeself.install.sh b/makeself/jobs/99-makeself.install.sh
index 0b828257d5..0e0d5c9da6 100755
--- a/makeself/jobs/99-makeself.install.sh
+++ b/makeself/jobs/99-makeself.install.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
. $(dirname "${0}")/../functions.sh "${@}" || exit 1
diff --git a/makeself/makeself-header.sh b/makeself/makeself-header.sh
index bf222f6c8e..19c1c3f994 100755
--- a/makeself/makeself-header.sh
+++ b/makeself/makeself-header.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
cat << EOF > "$archname"
#!/bin/sh
# This script was generated using Makeself $MS_VERSION
diff --git a/makeself/makeself.sh b/makeself/makeself.sh
index 39cc1aad2e..ee89df9a45 100755
--- a/makeself/makeself.sh
+++ b/makeself/makeself.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# Makeself version 2.3.x
# by Stephane Peter <megastep@megastep.org>
diff --git a/makeself/post-installer.sh b/makeself/post-installer.sh
index fd50f0f824..38cc41ef79 100755
--- a/makeself/post-installer.sh
+++ b/makeself/post-installer.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# This script is started using the shell of the system
# and executes our 'install-or-update.sh' script
diff --git a/makeself/run-all-jobs.sh b/makeself/run-all-jobs.sh
index 88a23ee0ab..7a35fe6486 100755
--- a/makeself/run-all-jobs.sh
+++ b/makeself/run-all-jobs.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
LC_ALL=C
umask 002
diff --git a/netdata-installer.sh b/netdata-installer.sh
index 2925f5f310..21765b0f25 100755
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# shellcheck disable=SC1090,SC1091,SC1117,SC2002,SC2034,SC2044,SC2046,SC2086,SC2129,SC2162,SC2166,SC2181
export PATH="${PATH}:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
diff --git a/netdata.spec.in b/netdata.spec.in
index 379088fa11..6090edeb2c 100644
--- a/netdata.spec.in
+++ b/netdata.spec.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
%global contentdir %{_datadir}/netdata
# This is temporary and should eventually be resolved. This bypasses
diff --git a/node.d/Makefile.am b/node.d/Makefile.am
index fbffccc741..157d922a8f 100644
--- a/node.d/Makefile.am
+++ b/node.d/Makefile.am
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
dist_node_DATA = \
diff --git a/node.d/fronius.node.js b/node.d/fronius.node.js
index f2ec344dec..436f3a325f 100644
--- a/node.d/fronius.node.js
+++ b/node.d/fronius.node.js
@@ -1,5 +1,5 @@
"use strict";
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
// This program will connect to one or more Fronius Symo Inverters.
// to get the Solar Power Generated (current, today).
diff --git a/node.d/named.node.js b/node.d/named.node.js
index 60147dafaf..d13c608cbb 100644
--- a/node.d/named.node.js
+++ b/node.d/named.node.js
@@ -1,5 +1,5 @@
'use strict';
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
// collect statistics from bind (named) v9.10+
//
diff --git a/node.d/node_modules/netdata.js b/node.d/node_modules/netdata.js
index 7861c9df4c..603922c6ed 100644
--- a/node.d/node_modules/netdata.js
+++ b/node.d/node_modules/netdata.js
@@ -3,7 +3,7 @@
// netdata
// real-time performance and health monitoring, done right!
// (C) 2016 Costa Tsaousis <costa@tsaousis.gr>
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
var url = require('url');
var http = require('http');
diff --git a/node.d/sma_webbox.node.js b/node.d/sma_webbox.node.js
index b0ac618d42..b9a168adcd 100644
--- a/node.d/sma_webbox.node.js
+++ b/node.d/sma_webbox.node.js
@@ -1,5 +1,5 @@
'use strict';
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
// This program will connect to one or more SMA Sunny Webboxes
// to get the Solar Power Generated (current, today, total).
diff --git a/node.d/snmp.node.js b/node.d/snmp.node.js
index 099bc1843f..62d2d277d5 100644
--- a/node.d/snmp.node.js
+++ b/node.d/snmp.node.js
@@ -1,5 +1,5 @@
'use strict';
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
// netdata snmp module
// This program will connect to one or more SNMP Agents
//
diff --git a/node.d/stiebeleltron.node.js b/node.d/stiebeleltron.node.js
index 4c7ede70c9..250c265402 100644
--- a/node.d/stiebeleltron.node.js
+++ b/node.d/stiebeleltron.node.js
@@ -1,5 +1,5 @@
'use strict';
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
// This program will connect to one Stiebel Eltron ISG for heatpump heating
// to get the heat pump metrics.
diff --git a/packaging/check-files b/packaging/check-files
index 7d7175b200..4372b2364c 100755
--- a/packaging/check-files
+++ b/packaging/check-files
@@ -1,5 +1,5 @@
#!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# check-files
diff --git a/packaging/git-build b/packaging/git-build
index f4a3778da4..645547b7fd 100755
--- a/packaging/git-build
+++ b/packaging/git-build
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# When run from the top-level repository, performs a complete clean
# and maintainer-mode rebuild of the FireHOL package.
diff --git a/packaging/packaging.functions b/packaging/packaging.functions
index f6924c95ec..cc7b41dc07 100644
--- a/packaging/packaging.functions
+++ b/packaging/packaging.functions
@@ -1,5 +1,5 @@
#!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
packaging_check_init() {
version_check=
diff --git a/packaging/release-msg b/packaging/release-msg
index 92678da374..f31a746bbb 100755
--- a/packaging/release-msg
+++ b/packaging/release-msg
@@ -1,5 +1,5 @@
#!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# release-msg
diff --git a/packaging/tar-compare b/packaging/tar-compare
index d457eb2302..71e38f1060 100755
--- a/packaging/tar-compare
+++ b/packaging/tar-compare
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# When provided with a git repo, which has been used to produce a
# distribution tar.gz (with make dist) and the resultant tar-file,
diff --git a/packaging/update-tags b/packaging/update-tags
index aa11eb2395..bfa5b580b0 100755
--- a/packaging/update-tags
+++ b/packaging/update-tags
@@ -1,5 +1,5 @@
#!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# update-tags
diff --git a/plugins.d/Makefile.am b/plugins.d/Makefile.am
index 904a3fdef8..6acec72752 100644
--- a/plugins.d/Makefile.am
+++ b/plugins.d/Makefile.am
@@ -1,6 +1,6 @@
#
# Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
CLEANFILES = \
diff --git a/plugins.d/alarm-email.sh b/plugins.d/alarm-email.sh
index 78791c0af6..69c4c3f8df 100755
--- a/plugins.d/alarm-email.sh
+++ b/plugins.d/alarm-email.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# OBSOLETE - REPLACED WITH
# alarm-notify.sh
diff --git a/plugins.d/alarm-notify.sh.in b/plugins.d/alarm-notify.sh.in
index dc481ad0a7..4aef3a521a 100755
--- a/plugins.d/alarm-notify.sh.in
+++ b/plugins.d/alarm-notify.sh.in
@@ -3,7 +3,7 @@
# netdata
# real-time performance and health monitoring, done right!
# (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# Script to send alarm notifications for netdata
#
diff --git a/plugins.d/alarm-test.sh b/plugins.d/alarm-test.sh
index bb73860146..828aa756bb 100755
--- a/plugins.d/alarm-test.sh
+++ b/plugins.d/alarm-test.sh
@@ -3,7 +3,7 @@
# netdata
# real-time performance and health monitoring, done right!
# (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# Script to test alarm notifications for netdata
diff --git a/plugins.d/cgroup-name.sh.in b/plugins.d/cgroup-name.sh.in
index 28b4c0893e..53696a4bf9 100755
--- a/plugins.d/cgroup-name.sh.in
+++ b/plugins.d/cgroup-name.sh.in
@@ -3,7 +3,7 @@
# netdata
# real-time performance and health monitoring, done right!
# (C) 2016 Costa Tsaousis <costa@tsaousis.gr>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# Script to find a better name for cgroups
#
diff --git a/plugins.d/cgroup-network-helper.sh b/plugins.d/cgroup-network-helper.sh
index a0969b2c8b..666f02fc88 100755
--- a/plugins.d/cgroup-network-helper.sh
+++ b/plugins.d/cgroup-network-helper.sh
@@ -5,7 +5,7 @@
# detect container and virtual machine interfaces
#
# (C) 2017 Costa Tsaousis
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# This script is called as root (by cgroup-network), with either a pid, or a cgroup path.
# It tries to find all the network interfaces that belong to the same cgroup.
diff --git a/plugins.d/charts.d.dryrun-helper.sh b/plugins.d/charts.d.dryrun-helper.sh
index 62c1a80403..67496c1bdf 100755
--- a/plugins.d/charts.d.dryrun-helper.sh
+++ b/plugins.d/charts.d.dryrun-helper.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# shellcheck disable=SC2181
diff --git a/plugins.d/charts.d.plugin.in b/plugins.d/charts.d.plugin.in
index 482cea0bc7..3477894d89 100755
--- a/plugins.d/charts.d.plugin.in
+++ b/plugins.d/charts.d.plugin.in
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/plugins.d/fping.plugin.in b/plugins.d/fping.plugin.in
index 0535206e74..2c03e418e1 100755
--- a/plugins.d/fping.plugin.in
+++ b/plugins.d/fping.plugin.in
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# netdata
# real-time performance and health monitoring, done right!
diff --git a/plugins.d/loopsleepms.sh.inc b/plugins.d/loopsleepms.sh.inc
index 7a611ea5b1..bdc032b99d 100644
--- a/plugins.d/loopsleepms.sh.inc
+++ b/plugins.d/loopsleepms.sh.inc
@@ -1,5 +1,5 @@
# no need for shebang - this file is included from other scripts
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
LOOPSLEEP_DATE="$(which date 2>/dev/null || command -v date 2>/dev/null)"
if [ -z "$LOOPSLEEP_DATE" ]
diff --git a/plugins.d/node.d.plugin.in b/plugins.d/node.d.plugin.in
index f22b7d8c95..05c126e900 100755
--- a/plugins.d/node.d.plugin.in
+++ b/plugins.d/node.d.plugin.in
@@ -11,7 +11,7 @@
// netdata
// real-time performance and health monitoring, done right!
// (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
// --------------------------------------------------------------------------------------------------------------------
diff --git a/plugins.d/python.d.plugin.in b/plugins.d/python.d.plugin.in
index f3fc9bfebf..04cbddd921 100755
--- a/plugins.d/python.d.plugin.in
+++ b/plugins.d/python.d.plugin.in
@@ -6,7 +6,7 @@ echo "ERROR python IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" # '''
# Description:
# Author: Pawel Krupa (paulfantom)
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import gc
import os
diff --git a/plugins.d/tc-qos-helper.sh.in b/plugins.d/tc-qos-helper.sh.in
index 27c853e62d..6f6b0a591a 100755
--- a/plugins.d/tc-qos-helper.sh.in
+++ b/plugins.d/tc-qos-helper.sh.in
@@ -3,7 +3,7 @@
# netdata
# real-time performance and health monitoring, done right!
# (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# This script is a helper to allow netdata collect tc data.
# tc output parsing has been implemented in C, inside netdata
diff --git a/python.d/Makefile.am b/python.d/Makefile.am
index 899e31244c..8463238d88 100644
--- a/python.d/Makefile.am
+++ b/python.d/Makefile.am
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
CLEANFILES = \
$(NULL)
diff --git a/python.d/apache.chart.py b/python.d/apache.chart.py
index 7736072f19..d136274d0b 100644
--- a/python.d/apache.chart.py
+++ b/python.d/apache.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: apache netdata python.d module
# Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.FrameworkServices.UrlService import UrlService
diff --git a/python.d/beanstalk.chart.py b/python.d/beanstalk.chart.py
index 9c2b0e5ad6..0a503ee194 100644
--- a/python.d/beanstalk.chart.py
+++ b/python.d/beanstalk.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: beanstalk netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
try:
import beanstalkc
diff --git a/python.d/bind_rndc.chart.py b/python.d/bind_rndc.chart.py
index 22aef02200..0b6cab3959 100644
--- a/python.d/bind_rndc.chart.py
+++ b/python.d/bind_rndc.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: bind rndc netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import os
diff --git a/python.d/boinc.chart.py b/python.d/boinc.chart.py
index 6291dd8602..d14754c4bb 100644
--- a/python.d/boinc.chart.py
+++ b/python.d/boinc.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: BOINC netdata python.d module
# Author: Austin S. Hemmelgarn (Ferroin)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import socket
diff --git a/python.d/ceph.chart.py b/python.d/ceph.chart.py
index 41955204c8..31c764d0fb 100644
--- a/python.d/ceph.chart.py
+++ b/python.d/ceph.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: ceph netdata python.d module
# Author: Luis Eduardo (lets00)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
try:
import rados
diff --git a/python.d/chrony.chart.py b/python.d/chrony.chart.py
index 93cd050182..fd01d4e855 100644
--- a/python.d/chrony.chart.py
+++ b/python.d/chrony.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: chrony netdata python.d module
# Author: Dominik Schloesser (domschl)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.FrameworkServices.ExecutableService import ExecutableService
diff --git a/python.d/couchdb.chart.py b/python.d/couchdb.chart.py
index dcb2df33bf..5d6b9916f9 100644
--- a/python.d/couchdb.chart.py
+++ b/python.d/couchdb.chart.py
@@ -2,7 +2,7 @@
# Description: couchdb netdata python.d module
# Author: wohali <wohali@apache.org>
# Thanks to l2isbad for good examples :)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from collections import namedtuple, defaultdict
from json import loads
diff --git a/python.d/cpufreq.chart.py b/python.d/cpufreq.chart.py
index 3ffd26d688..cbbab6d7fe 100644
--- a/python.d/cpufreq.chart.py
+++ b/python.d/cpufreq.chart.py
@@ -2,7 +2,7 @@
# Description: cpufreq netdata python.d module
# Author: Pawel Krupa (paulfantom)
# Author: Steven Noonan (tycho)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import glob
import os
diff --git a/python.d/cpuidle.chart.py b/python.d/cpuidle.chart.py
index e3acb4dd26..feac025bf8 100644
--- a/python.d/cpuidle.chart.py
+++ b/python.d/cpuidle.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: cpuidle netdata python.d module
# Author: Steven Noonan (tycho)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import ctypes
import glob
diff --git a/python.d/dns_query_time.chart.py b/python.d/dns_query_time.chart.py
index 5bc95c4f6a..d3c3db788b 100644
--- a/python.d/dns_query_time.chart.py
+++ b/python.d/dns_query_time.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: dns_query_time netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from random import choice
from socket import getaddrinfo, gaierror
diff --git a/python.d/dnsdist.chart.py b/python.d/dnsdist.chart.py
index 4a44adebb0..1aff3f8031 100644
--- a/python.d/dnsdist.chart.py
+++ b/python.d/dnsdist.chart.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from json import loads
diff --git a/python.d/dovecot.chart.py b/python.d/dovecot.chart.py
index df58c1850b..7fee3bfac1 100644
--- a/python.d/dovecot.chart.py
+++ b/python.d/dovecot.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: dovecot netdata python.d module
# Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.FrameworkServices.SocketService import SocketService
diff --git a/python.d/elasticsearch.chart.py b/python.d/elasticsearch.chart.py
index d7fc5fd22a..3f431f6e08 100644
--- a/python.d/elasticsearch.chart.py
+++ b/python.d/elasticsearch.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: elastic search node stats netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import json
import threading
diff --git a/python.d/example.chart.py b/python.d/example.chart.py
index fb4531d7df..85defa4d12 100644
--- a/python.d/example.chart.py
+++ b/python.d/example.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: example netdata python.d module
# Author: Put your name here (your github login)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from random import SystemRandom
diff --git a/python.d/exim.chart.py b/python.d/exim.chart.py
index 97c010577d..5431dd46ba 100644
--- a/python.d/exim.chart.py
+++ b/python.d/exim.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: exim netdata python.d module
# Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.FrameworkServices.ExecutableService import ExecutableService
diff --git a/python.d/fail2ban.chart.py b/python.d/fail2ban.chart.py
index 447952b278..fef0425a72 100644
--- a/python.d/fail2ban.chart.py
+++ b/python.d/fail2ban.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: fail2ban log netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import re
import os
diff --git a/python.d/freeradius.chart.py b/python.d/freeradius.chart.py
index 9a97df6e90..3126831b70 100644
--- a/python.d/freeradius.chart.py
+++ b/python.d/freeradius.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: freeradius netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from re import findall
from subprocess import Popen, PIPE
diff --git a/python.d/go_expvar.chart.py b/python.d/go_expvar.chart.py
index 88f05e92cc..76e8b72ec6 100644
--- a/python.d/go_expvar.chart.py
+++ b/python.d/go_expvar.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: go_expvar netdata python.d module
# Author: Jan Kral (kralewitz)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from __future__ import division
import json
diff --git a/python.d/haproxy.chart.py b/python.d/haproxy.chart.py
index 197c8fde73..a46689f50c 100644
--- a/python.d/haproxy.chart.py
+++ b/python.d/haproxy.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: haproxy netdata python.d module
# Author: l2isbad, ktarasz
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from collections import defaultdict
from re import compile as re_compile
diff --git a/python.d/hddtemp.chart.py b/python.d/hddtemp.chart.py
index b4632171a9..dea7011712 100644
--- a/python.d/hddtemp.chart.py
+++ b/python.d/hddtemp.chart.py
@@ -2,7 +2,7 @@
# Description: hddtemp netdata python.d module
# Author: Pawel Krupa (paulfantom)
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import re
diff --git a/python.d/httpcheck.chart.py b/python.d/httpcheck.chart.py
index 35684f1f10..f046f33c02 100644
--- a/python.d/httpcheck.chart.py
+++ b/python.d/httpcheck.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: http check netdata python.d module
# Original Author: ccremer (github.com/ccremer)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import urllib3
import re
diff --git a/python.d/icecast.chart.py b/python.d/icecast.chart.py
index 2ff311c246..394bf19f03 100644
--- a/python.d/icecast.chart.py
+++ b/python.d/icecast.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: icecast netdata python.d module
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import json
diff --git a/python.d/ipfs.chart.py b/python.d/ipfs.chart.py
index e6f4eb5015..3f6794e48c 100644
--- a/python.d/ipfs.chart.py
+++ b/python.d/ipfs.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: IPFS netdata python.d module
# Authors: davidak
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import json
diff --git a/python.d/isc_dhcpd.chart.py b/python.d/isc_dhcpd.chart.py
index 2fa453c453..a9f2749491 100644
--- a/python.d/isc_dhcpd.chart.py
+++ b/python.d/isc_dhcpd.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: isc dhcpd lease netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import os
import re
diff --git a/python.d/litespeed.chart.py b/python.d/litespeed.chart.py
index c8e893fde1..efdc6869cb 100644
--- a/python.d/litespeed.chart.py
+++ b/python.d/litespeed.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: litespeed netdata python.d module
# Author: Ilya Maschenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import glob
import re
diff --git a/python.d/logind.chart.py b/python.d/logind.chart.py
index a7b020a3aa..bfc486c7ff 100644
--- a/python.d/logind.chart.py
+++ b/python.d/logind.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: logind netdata python.d module
# Author: Austin S. Hemmelgarn (Ferroin)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.FrameworkServices.ExecutableService import ExecutableService
diff --git a/python.d/mdstat.chart.py b/python.d/mdstat.chart.py
index ffc8fffa88..b7306b6a7f 100644
--- a/python.d/mdstat.chart.py
+++ b/python.d/mdstat.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: mdstat netdata python.d module
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import re
diff --git a/python.d/megacli.chart.py b/python.d/megacli.chart.py
index c1e7b54a7a..e9f1fe6813 100644
--- a/python.d/megacli.chart.py
+++ b/python.d/megacli.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: megacli netdata python.d module
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import re
diff --git a/python.d/memcached.chart.py b/python.d/memcached.chart.py
index 8dbc52a4da..68a69b3677 100644
--- a/python.d/memcached.chart.py
+++ b/python.d/memcached.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: memcached netdata python.d module
# Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.FrameworkServices.SocketService import SocketService
diff --git a/python.d/mongodb.chart.py b/python.d/mongodb.chart.py
index aad3b2b54b..ef75b1afdf 100644
--- a/python.d/mongodb.chart.py
+++ b/python.d/mongodb.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: mongodb netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from copy import deepcopy
from datetime import datetime
diff --git a/python.d/monit.chart.py b/python.d/monit.chart.py
index f6544ab384..51943c0e13 100644
--- a/python.d/monit.chart.py
+++ b/python.d/monit.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: monit netdata python.d module
# Author: Evgeniy K. (n0guest)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import xml.etree.ElementTree as ET
from bases.FrameworkServices.UrlService import UrlService
diff --git a/python.d/mysql.chart.py b/python.d/mysql.chart.py
index a2a32f6747..dbf6943604 100644
--- a/python.d/mysql.chart.py
+++ b/python.d/mysql.chart.py
@@ -2,7 +2,7 @@
# Description: MySQL netdata python.d module
# Author: Pawel Krupa (paulfantom)
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.FrameworkServices.MySQLService import MySQLService
diff --git a/python.d/nginx.chart.py b/python.d/nginx.chart.py
index 3386668c49..09c6bbd37e 100644
--- a/python.d/nginx.chart.py
+++ b/python.d/nginx.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: nginx netdata python.d module
# Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.FrameworkServices.UrlService import UrlService
diff --git a/python.d/nginx_plus.chart.py b/python.d/nginx_plus.chart.py
index d97a9e3738..1392f5a567 100644
--- a/python.d/nginx_plus.chart.py
+++ b/python.d/nginx_plus.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: nginx_plus netdata python.d module
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import re
diff --git a/python.d/nsd.chart.py b/python.d/nsd.chart.py
index a20b8f5901..d713f46bd5 100644
--- a/python.d/nsd.chart.py
+++ b/python.d/nsd.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: NSD `nsd-control stats_noreset` netdata python.d module
# Author: <383c57 at gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import re
diff --git a/python.d/ntpd.chart.py b/python.d/ntpd.chart.py
index 5245f934fb..79d557c803 100644
--- a/python.d/ntpd.chart.py
+++ b/python.d/ntpd.chart.py
@@ -2,7 +2,7 @@
# Description: ntpd netdata python.d module
# Author: Sven Mäder (rda0)
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import struct
import re
diff --git a/python.d/ovpn_status_log.chart.py b/python.d/ovpn_status_log.chart.py
index fa44f59f2d..64d7062d98 100644
--- a/python.d/ovpn_status_log.chart.py
+++ b/python.d/ovpn_status_log.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: openvpn status log netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from re import compile as r_compile
diff --git a/python.d/phpfpm.chart.py b/python.d/phpfpm.chart.py
index 8921ae837d..a3f0963fca 100644
--- a/python.d/phpfpm.chart.py
+++ b/python.d/phpfpm.chart.py
@@ -2,7 +2,7 @@
# Description: PHP-FPM netdata python.d module
# Author: Pawel Krupa (paulfantom)
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import json
import re
diff --git a/python.d/portcheck.chart.py b/python.d/portcheck.chart.py
index 1fe8074b56..862e83dbd1 100644
--- a/python.d/portcheck.chart.py
+++ b/python.d/portcheck.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: simple port check netdata python.d module
# Original Author: ccremer (github.com/ccremer)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import socket
diff --git a/python.d/postfix.chart.py b/python.d/postfix.chart.py
index 28084af0e6..bdbd0feeaf 100644
--- a/python.d/postfix.chart.py
+++ b/python.d/postfix.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: postfix netdata python.d module
# Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.FrameworkServices.ExecutableService import ExecutableService
diff --git a/python.d/postgres.chart.py b/python.d/postgres.chart.py
index 10c89d5280..e01fb0ef8a 100644
--- a/python.d/postgres.chart.py
+++ b/python.d/postgres.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: example netdata python.d module
# Authors: facetoe, dangtranhoang
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from copy import deepcopy
diff --git a/python.d/powerdns.chart.py b/python.d/powerdns.chart.py
index af9dddf917..4264621b2f 100644
--- a/python.d/powerdns.chart.py
+++ b/python.d/powerdns.chart.py
@@ -2,7 +2,7 @@
# Description: powerdns netdata python.d module
# Author: Ilya Mashchenko (l2isbad)
# Author: Luke Whitworth
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from json import loads
diff --git a/python.d/puppet.chart.py b/python.d/puppet.chart.py
index fde8dfdfe4..5c8e48bd9c 100644
--- a/python.d/puppet.chart.py
+++ b/python.d/puppet.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: puppet netdata python.d module
# Author: Andrey Galkin <andrey@futoin.org> (andvgal)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# This module should work both with OpenSource and PE versions
# of PuppetServer and PuppetDB.
diff --git a/python.d/python_modules/bases/FrameworkServices/ExecutableService.py b/python.d/python_modules/bases/FrameworkServices/ExecutableService.py
index 625f643234..72f4553217 100644
--- a/python.d/python_modules/bases/FrameworkServices/ExecutableService.py
+++ b/python.d/python_modules/bases/FrameworkServices/ExecutableService.py
@@ -2,7 +2,7 @@
# Description:
# Author: Pawel Krupa (paulfantom)
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import os
diff --git a/python.d/python_modules/bases/FrameworkServices/LogService.py b/python.d/python_modules/bases/FrameworkServices/LogService.py
index 241598973d..5acfd73f8e 100644
--- a/python.d/python_modules/bases/FrameworkServices/LogService.py
+++ b/python.d/python_modules/bases/FrameworkServices/LogService.py
@@ -2,7 +2,7 @@
# Description:
# Author: Pawel Krupa (paulfantom)
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from glob import glob
import os
diff --git a/python.d/python_modules/bases/FrameworkServices/MySQLService.py b/python.d/python_modules/bases/FrameworkServices/MySQLService.py
index d72a97292c..53807e2c4e 100644
--- a/python.d/python_modules/bases/FrameworkServices/MySQLService.py
+++ b/python.d/python_modules/bases/FrameworkServices/MySQLService.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description:
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from sys import exc_info
diff --git a/python.d/python_modules/bases/FrameworkServices/SimpleService.py b/python.d/python_modules/bases/FrameworkServices/SimpleService.py
index cf10e3f9a2..dd53fbc14a 100644
--- a/python.d/python_modules/bases/FrameworkServices/SimpleService.py
+++ b/python.d/python_modules/bases/FrameworkServices/SimpleService.py
@@ -2,7 +2,7 @@
# Description:
# Author: Pawel Krupa (paulfantom)
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from threading import Thread
from time import sleep
diff --git a/python.d/python_modules/bases/FrameworkServices/SocketService.py b/python.d/python_modules/bases/FrameworkServices/SocketService.py
index 63bb3201e5..137693c38e 100644
--- a/python.d/python_modules/bases/FrameworkServices/SocketService.py
+++ b/python.d/python_modules/bases/FrameworkServices/SocketService.py
@@ -2,7 +2,7 @@
# Description:
# Author: Pawel Krupa (paulfantom)
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import socket
diff --git a/python.d/python_modules/bases/FrameworkServices/UrlService.py b/python.d/python_modules/bases/FrameworkServices/UrlService.py
index 68f7e86e41..856f388515 100644
--- a/python.d/python_modules/bases/FrameworkServices/UrlService.py
+++ b/python.d/python_modules/bases/FrameworkServices/UrlService.py
@@ -2,7 +2,7 @@
# Description:
# Author: Pawel Krupa (paulfantom)
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import urllib3
diff --git a/python.d/python_modules/bases/charts.py b/python.d/python_modules/bases/charts.py
index 14b2bd562e..2963739ec3 100644
--- a/python.d/python_modules/bases/charts.py
+++ b/python.d/python_modules/bases/charts.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description:
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.collection import safe_print
diff --git a/python.d/python_modules/bases/collection.py b/python.d/python_modules/bases/collection.py
index d95124889c..479a3b6100 100644
--- a/python.d/python_modules/bases/collection.py
+++ b/python.d/python_modules/bases/collection.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description:
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import os
diff --git a/python.d/python_modules/bases/loaders.py b/python.d/python_modules/bases/loaders.py
index 15a874ba1b..9eb268ce75 100644
--- a/python.d/python_modules/bases/loaders.py
+++ b/python.d/python_modules/bases/loaders.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description:
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import types
diff --git a/python.d/python_modules/bases/loggers.py b/python.d/python_modules/bases/loggers.py
index 6ac1dd058a..39be77a794 100644
--- a/python.d/python_modules/bases/loggers.py
+++ b/python.d/python_modules/bases/loggers.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description:
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import logging
import traceback
diff --git a/python.d/rabbitmq.chart.py b/python.d/rabbitmq.chart.py
index eee190b33b..8298b40326 100644
--- a/python.d/rabbitmq.chart.py
+++ b/python.d/rabbitmq.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: rabbitmq netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from collections import namedtuple
from json import loads
diff --git a/python.d/redis.chart.py b/python.d/redis.chart.py
index 3a5ae1f247..37d55ebfe4 100644
--- a/python.d/redis.chart.py
+++ b/python.d/redis.chart.py
@@ -2,7 +2,7 @@
# Description: redis netdata python.d module
# Author: Pawel Krupa (paulfantom)
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import re
diff --git a/python.d/rethinkdbs.chart.py b/python.d/rethinkdbs.chart.py
index 2460416acd..127e9ad4bc 100644
--- a/python.d/rethinkdbs.chart.py
+++ b/python.d/rethinkdbs.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: rethinkdb netdata python.d module
# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
try:
import rethinkdb as rdb
diff --git a/python.d/retroshare.chart.py b/python.d/retroshare.chart.py
index 257e9a0d96..1d8e350502 100644
--- a/python.d/retroshare.chart.py
+++ b/python.d/retroshare.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: RetroShare netdata python.d module
# Authors: sehraf
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import json
diff --git a/python.d/samba.chart.py b/python.d/samba.chart.py
index 59f59a8d08..27c1c72ecc 100644
--- a/python.d/samba.chart.py
+++ b/python.d/samba.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: samba netdata python.d module
# Author: Christopher Cox <chris_cox@endlessnow.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# The netdata user needs to be able to be able to sudo the smbstatus program
# without password:
diff --git a/python.d/sensors.chart.py b/python.d/sensors.chart.py
index 84ce97ca84..69d2bfe99f 100644
--- a/python.d/sensors.chart.py
+++ b/python.d/sensors.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: sensors netdata python.d plugin
# Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.FrameworkServices.SimpleService import SimpleService
from third_party import lm_sensors as sensors
diff --git a/python.d/smartd_log.chart.py b/python.d/smartd_log.chart.py
index ef4d10ee42..21dbcceccb 100644
--- a/python.d/smartd_log.chart.py
+++ b/python.d/smartd_log.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: smart netdata python.d module
# Author: l2isbad, vorph1
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import os
import re
diff --git a/python.d/spigotmc.chart.py b/python.d/spigotmc.chart.py
index ecdd8f44bf..a5e5ee0eee 100644
--- a/python.d/spigotmc.chart.py
+++ b/python.d/spigotmc.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: spigotmc netdata python.d module
# Author: Austin S. Hemmelgarn (Ferroin)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import socket
import platform
diff --git a/python.d/springboot.chart.py b/python.d/springboot.chart.py
index 642da04bfc..7df37e1d0c 100644
--- a/python.d/springboot.chart.py
+++ b/python.d/springboot.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: tomcat netdata python.d module
# Author: Wing924
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import json
from bases.FrameworkServices.UrlService import UrlService
diff --git a/python.d/squid.chart.py b/python.d/squid.chart.py
index 168e7fdbcd..fd54168f02 100644
--- a/python.d/squid.chart.py
+++ b/python.d/squid.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: squid netdata python.d module
# Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from bases.FrameworkServices.SocketService import SocketService
diff --git a/python.d/tomcat.chart.py b/python.d/tomcat.chart.py
index e6883b1169..3c2d0ed406 100644
--- a/python.d/tomcat.chart.py
+++ b/python.d/tomcat.chart.py
@@ -2,7 +2,7 @@
# Description: tomcat netdata python.d module
# Author: Pawel Krupa (paulfantom)
# Author: Wei He (Wing924)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import xml.etree.ElementTree as ET
diff --git a/python.d/traefik.chart.py b/python.d/traefik.chart.py
index 312575a66f..dc89332208 100644
--- a/python.d/traefik.chart.py
+++ b/python.d/traefik.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: traefik netdata python.d module
# Author: Alexandre Menezes (@ale_menezes)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
from json import loads
from collections import defaultdict
diff --git a/python.d/unbound.chart.py b/python.d/unbound.chart.py
index 6ed8b1a36c..52fcbf7e23 100644
--- a/python.d/unbound.chart.py
+++ b/python.d/unbound.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: unbound netdata python.d module
# Author: Austin S. Hemmelgarn (Ferroin)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import os
import sys
diff --git a/python.d/varnish.chart.py b/python.d/varnish.chart.py
index b807b0b92d..d889c2b335 100644
--- a/python.d/varnish.chart.py
+++ b/python.d/varnish.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: varnish netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import re
diff --git a/python.d/w1sensor.chart.py b/python.d/w1sensor.chart.py
index f5de417078..493c4a135d 100644
--- a/python.d/w1sensor.chart.py
+++ b/python.d/w1sensor.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: 1-wire temperature monitor netdata python.d module
# Author: Diomidis Spinellis <http://www.spinellis.gr>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import os
import re
diff --git a/python.d/web_log.chart.py b/python.d/web_log.chart.py
index 7005cd4719..cf2b5bfb2d 100644
--- a/python.d/web_log.chart.py
+++ b/python.d/web_log.chart.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Description: web log netdata python.d module
# Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
import bisect
import re
diff --git a/src/Makefile.am b/src/Makefile.am
index d8505d9384..21a67a6cf1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
#
# Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
diff --git a/src/adaptive_resortable_list.c b/src/adaptive_resortable_list.c
index d735ea5f3e..549280e20b 100644
--- a/src/adaptive_resortable_list.c
+++ b/src/adaptive_resortable_list.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/adaptive_resortable_list.h b/src/adaptive_resortable_list.h
index c38166730a..ace2472011 100644
--- a/src/adaptive_resortable_list.h
+++ b/src/adaptive_resortable_list.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_ADAPTIVE_RESORTABLE_LIST_H
#define NETDATA_ADAPTIVE_RESORTABLE_LIST_H 1
diff --git a/src/appconfig.c b/src/appconfig.c
index 75c1f3c566..5c7193f651 100644
--- a/src/appconfig.c
+++ b/src/appconfig.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/appconfig.h b/src/appconfig.h
index 1b6568ec06..811e24952a 100644
--- a/src/appconfig.h
+++ b/src/appconfig.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/apps_plugin.c b/src/apps_plugin.c
index 920f5e1403..1dc3b711ec 100644
--- a/src/apps_plugin.c
+++ b/src/apps_plugin.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
/*
* netdata apps.plugin
diff --git a/src/avl.c b/src/avl.c
index fa5e49d415..503c7a01a8 100644
--- a/src/avl.c
+++ b/src/avl.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-3.0+
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include "common.h"
diff --git a/src/avl.h b/src/avl.h
index cdd4722d00..b239111c63 100644
--- a/src/avl.h
+++ b/src/avl.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-3.0+
+// SPDX-License-Identifier: LGPL-3.0-or-later
#ifndef _AVL_H
#define _AVL_H 1
diff --git a/src/backend_prometheus.c b/src/backend_prometheus.c
index cbcd7516e8..f16cb09c8e 100644
--- a/src/backend_prometheus.c
+++ b/src/backend_prometheus.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/backend_prometheus.h b/src/backend_prometheus.h
index aad4f168df..a263867a0f 100644
--- a/src/backend_prometheus.h
+++ b/src/backend_prometheus.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_BACKEND_PROMETHEUS_H
#define NETDATA_BACKEND_PROMETHEUS_H 1
diff --git a/src/backends.c b/src/backends.c
index 208ff5e2df..ca4bf73adc 100644
--- a/src/backends.c
+++ b/src/backends.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/backends.h b/src/backends.h
index 89f16744f5..3239b017a4 100644
--- a/src/backends.h
+++ b/src/backends.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_BACKENDS_H
#define NETDATA_BACKENDS_H 1
diff --git a/src/cgroup-network.c b/src/cgroup-network.c
index 1ab2ffdf65..f21e6e1072 100644
--- a/src/cgroup-network.c
+++ b/src/cgroup-network.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include <libgen.h>
diff --git a/src/clocks.c b/src/clocks.c
index 93b053c766..3c94de6422 100644
--- a/src/clocks.c
+++ b/src/clocks.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/clocks.h b/src/clocks.h
index 87c56849e5..97bc5adc28 100644
--- a/src/clocks.h
+++ b/src/clocks.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_CLOCKS_H
#define NETDATA_CLOCKS_H 1
diff --git a/src/common.c b/src/common.c
index 10b5af54d7..eb5c4b7268 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/common.h b/src/common.h
index 2806bd989f..0c1191febb 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_COMMON_H
#define NETDATA_COMMON_H 1
diff --git a/src/daemon.c b/src/daemon.c
index 21f3d2a762..4ad082b95e 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include <sched.h>
diff --git a/src/daemon.h b/src/daemon.h
index 3daa724ada..412691107d 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_DAEMON_H
#define NETDATA_DAEMON_H 1
diff --git a/src/dictionary.c b/src/dictionary.c
index b9875283fc..a5cd8a9637 100644
--- a/src/dictionary.c
+++ b/src/dictionary.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/dictionary.h b/src/dictionary.h
index 44c917e1e0..c872e2a810 100644
--- a/src/dictionary.h
+++ b/src/dictionary.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_DICTIONARY_H
#define NETDATA_DICTIONARY_H 1
diff --git a/src/eval.c b/src/eval.c
index abec876f3a..df19d704bd 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/eval.h b/src/eval.h
index 2810685194..a2c8a78630 100644
--- a/src/eval.h
+++ b/src/eval.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_EVAL_H
#define NETDATA_EVAL_H 1
diff --git a/src/freebsd_devstat.c b/src/freebsd_devstat.c
index b2f0dbb293..ec1cecab72 100644
--- a/src/freebsd_devstat.c
+++ b/src/freebsd_devstat.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/freebsd_getifaddrs.c b/src/freebsd_getifaddrs.c
index 73fbe4623e..6f80d8d8b5 100644
--- a/src/freebsd_getifaddrs.c
+++ b/src/freebsd_getifaddrs.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/freebsd_getmntinfo.c b/src/freebsd_getmntinfo.c
index 33e1a18b1d..1168f33d36 100644
--- a/src/freebsd_getmntinfo.c
+++ b/src/freebsd_getmntinfo.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/freebsd_ipfw.c b/src/freebsd_ipfw.c
index abfba824a6..6a41fb5e7a 100644
--- a/src/freebsd_ipfw.c
+++ b/src/freebsd_ipfw.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/freebsd_kstat_zfs.c b/src/freebsd_kstat_zfs.c
index b1c42a72de..3cf7e47ae0 100644
--- a/src/freebsd_kstat_zfs.c
+++ b/src/freebsd_kstat_zfs.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/freebsd_sysctl.c b/src/freebsd_sysctl.c
index 8b3ef42967..e1a2ece6fe 100644
--- a/src/freebsd_sysctl.c
+++ b/src/freebsd_sysctl.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/freeipmi_plugin.c b/src/freeipmi_plugin.c
index a0c823ef3d..ad4dda139c 100644
--- a/src/freeipmi_plugin.c
+++ b/src/freeipmi_plugin.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
/*
* netdata freeipmi.plugin
* Copyright (C) 2017 Costa Tsaousis
diff --git a/src/global_statistics.c b/src/global_statistics.c
index 9ef7240d60..ff980e43ce 100644
--- a/src/global_statistics.c
+++ b/src/global_statistics.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/global_statistics.h b/src/global_statistics.h
index f0b8c4e714..6d9f1268e9 100644
--- a/src/global_statistics.h
+++ b/src/global_statistics.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_GLOBAL_STATISTICS_H
#define NETDATA_GLOBAL_STATISTICS_H 1
diff --git a/src/health.c b/src/health.c
index 6c689b5a0d..0f6c6923f8 100644
--- a/src/health.c
+++ b/src/health.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_HEALTH_INTERNALS
#include "common.h"
diff --git a/src/health.h b/src/health.h
index 741dfcf659..96bdcc8eca 100644
--- a/src/health.h
+++ b/src/health.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/health_config.c b/src/health_config.c
index 9f1b06eaa0..618f071711 100644
--- a/src/health_config.c
+++ b/src/health_config.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_HEALTH_INTERNALS
#include "common.h"
diff --git a/src/health_json.c b/src/health_json.c
index 40cea1cd37..a3db997492 100644
--- a/src/health_json.c
+++ b/src/health_json.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_HEALTH_INTERNALS
#include "common.h"
diff --git a/src/health_log.c b/src/health_log.c
index a38ce85a42..16f2aeaa77 100644
--- a/src/health_log.c
+++ b/src/health_log.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_HEALTH_INTERNALS
#include "common.h"
diff --git a/src/inlined.h b/src/inlined.h
index 4f313ddcb6..bd63271bfc 100644
--- a/src/inlined.h
+++ b/src/inlined.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_INLINED_H
#define NETDATA_INLINED_H 1
diff --git a/src/ipc.c b/src/ipc.c
index 3d06c53c1c..06f5e76c6c 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/ipc.h b/src/ipc.h
index 8ca09cafbe..9b044fd9ff 100644
--- a/src/ipc.h
+++ b/src/ipc.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_PLUGIN_IPC_H
#define NETDATA_PLUGIN_IPC_H 1
diff --git a/src/locks.c b/src/locks.c
index 8ef9b9cba3..ca9f4916f7 100644
--- a/src/locks.c
+++ b/src/locks.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/locks.h b/src/locks.h
index 9c71b4d0b1..9736a06e62 100644
--- a/src/locks.h
+++ b/src/locks.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_LOCKS_H
#define NETDATA_LOCKS_H 1
diff --git a/src/log.c b/src/log.c
index 70be0b0f67..b9d47df71b 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/log.h b/src/log.h
index 497093a947..f1b7177d05 100644
--- a/src/log.h
+++ b/src/log.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_LOG_H
#define NETDATA_LOG_H 1
diff --git a/src/macos_fw.c b/src/macos_fw.c
index 692d9fea52..29ec920c11 100644
--- a/src/macos_fw.c
+++ b/src/macos_fw.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/macos_mach_smi.c b/src/macos_mach_smi.c
index d217bb3bf1..cfd1b0fe69 100644
--- a/src/macos_mach_smi.c
+++ b/src/macos_mach_smi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/macos_sysctl.c b/src/macos_sysctl.c
index 6204f5b373..7e0c19b41a 100644
--- a/src/macos_sysctl.c
+++ b/src/macos_sysctl.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/main.c b/src/main.c
index 1d0f0c1ea2..367e402491 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/main.h b/src/main.h
index 8f1db715c7..100650f404 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_MAIN_H
#define NETDATA_MAIN_H 1
diff --git a/src/plugin_checks.c b/src/plugin_checks.c
index 1ebd8f9ab4..5d8ac74aa7 100644
--- a/src/plugin_checks.c
+++ b/src/plugin_checks.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/plugin_checks.h b/src/plugin_checks.h
index a15f6ce26a..81a3465760 100644
--- a/src/plugin_checks.h
+++ b/src/plugin_checks.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_PLUGIN_CHECKS_H
#define NETDATA_PLUGIN_CHECKS_H 1
diff --git a/src/plugin_freebsd.c b/src/plugin_freebsd.c
index 21e70b601f..bd158340fc 100644
--- a/src/plugin_freebsd.c
+++ b/src/plugin_freebsd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/plugin_freebsd.h b/src/plugin_freebsd.h
index e23ee050f2..921fd0df1b 100644
--- a/src/plugin_freebsd.h
+++ b/src/plugin_freebsd.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_PLUGIN_FREEBSD_H
#define NETDATA_PLUGIN_FREEBSD_H 1
diff --git a/src/plugin_idlejitter.c b/src/plugin_idlejitter.c
index a40afc092f..3c2df446f6 100644
--- a/src/plugin_idlejitter.c
+++ b/src/plugin_idlejitter.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/plugin_idlejitter.h b/src/plugin_idlejitter.h
index 44dcd81798..0a5b3f5841 100644
--- a/src/plugin_idlejitter.h
+++ b/src/plugin_idlejitter.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_PLUGIN_IDLEJITTER_H
#define NETDATA_PLUGIN_IDLEJITTER_H 1
diff --git a/src/plugin_macos.c b/src/plugin_macos.c
index b7754d6a14..155f5ea1b4 100644
--- a/src/plugin_macos.c
+++ b/src/plugin_macos.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/plugin_macos.h b/src/plugin_macos.h
index d16fe3b051..2442c1d02c 100644
--- a/src/plugin_macos.h
+++ b/src/plugin_macos.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_PLUGIN_MACOS_H
#define NETDATA_PLUGIN_MACOS_H 1
diff --git a/src/plugin_nfacct.c b/src/plugin_nfacct.c
index c36b63abc5..6059608aa1 100644
--- a/src/plugin_nfacct.c
+++ b/src/plugin_nfacct.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/plugin_nfacct.h b/src/plugin_nfacct.h
index a278d6025d..6140b0418f 100644
--- a/src/plugin_nfacct.h
+++ b/src/plugin_nfacct.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_NFACCT_H
#define NETDATA_NFACCT_H 1
diff --git a/src/plugin_proc.c b/src/plugin_proc.c
index 45d12139b6..becb442430 100644
--- a/src/plugin_proc.c
+++ b/src/plugin_proc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/plugin_proc.h b/src/plugin_proc.h
index 27d6aa63db..413b8e6de0 100644
--- a/src/plugin_proc.h
+++ b/src/plugin_proc.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_PLUGIN_PROC_H
#define NETDATA_PLUGIN_PROC_H 1
diff --git a/src/plugin_proc_diskspace.c b/src/plugin_proc_diskspace.c
index af8c10d6d7..caa44aca91 100644
--- a/src/plugin_proc_diskspace.c
+++ b/src/plugin_proc_diskspace.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/plugin_proc_diskspace.h b/src/plugin_proc_diskspace.h
index 609a7f67ff..0f6557f187 100644
--- a/src/plugin_proc_diskspace.h
+++ b/src/plugin_proc_diskspace.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_PLUGIN_PROC_DISKSPACE_H
#define NETDATA_PLUGIN_PROC_DISKSPACE_H
diff --git a/src/plugin_tc.c b/src/plugin_tc.c
index 1908371d60..b6f89600ab 100644
--- a/src/plugin_tc.c
+++ b/src/plugin_tc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/plugin_tc.h b/src/plugin_tc.h
index 57d6a4d0b6..f23669daec 100644
--- a/src/plugin_tc.h
+++ b/src/plugin_tc.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_PLUGIN_TC_H
#define NETDATA_PLUGIN_TC_H 1
diff --git a/src/plugins_d.c b/src/plugins_d.c
index b7cd959b07..ec4129072e 100644
--- a/src/plugins_d.c
+++ b/src/plugins_d.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/plugins_d.h b/src/plugins_d.h
index b6f9c92c36..400dc096f5 100644
--- a/src/plugins_d.h
+++ b/src/plugins_d.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_PLUGINS_D_H
#define NETDATA_PLUGINS_D_H 1
diff --git a/src/popen.c b/src/popen.c
index e59e060142..cda6b10d58 100644
--- a/src/popen.c
+++ b/src/popen.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/popen.h b/src/popen.h
index 4477179760..7c211fe21e 100644
--- a/src/popen.h
+++ b/src/popen.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_POPEN_H
#define NETDATA_POPEN_H 1
diff --git a/src/proc_diskstats.c b/src/proc_diskstats.c
index e299b4daf7..9da75f4bdf 100644
--- a/src/proc_diskstats.c
+++ b/src/proc_diskstats.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_interrupts.c b/src/proc_interrupts.c
index 71b14c9f4e..c369068e91 100644
--- a/src/proc_interrupts.c
+++ b/src/proc_interrupts.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_loadavg.c b/src/proc_loadavg.c
index 816863676f..387eb65497 100644
--- a/src/proc_loadavg.c
+++ b/src/proc_loadavg.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_meminfo.c b/src/proc_meminfo.c
index 4190ec5fbc..df6c4b49d4 100644
--- a/src/proc_meminfo.c
+++ b/src/proc_meminfo.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_dev.c b/src/proc_net_dev.c
index ca69ee58ca..77be7c8339 100644
--- a/src/proc_net_dev.c
+++ b/src/proc_net_dev.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_ip_vs_stats.c b/src/proc_net_ip_vs_stats.c
index 837c9ebeca..3dd29c6170 100644
--- a/src/proc_net_ip_vs_stats.c
+++ b/src/proc_net_ip_vs_stats.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_netstat.c b/src/proc_net_netstat.c
index 712e2a354e..3a7c3c19ef 100644
--- a/src/proc_net_netstat.c
+++ b/src/proc_net_netstat.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_rpc_nfs.c b/src/proc_net_rpc_nfs.c
index 1a8aaf8361..2cd0fb4877 100644
--- a/src/proc_net_rpc_nfs.c
+++ b/src/proc_net_rpc_nfs.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_rpc_nfsd.c b/src/proc_net_rpc_nfsd.c
index 1b6a71e117..1005c03edb 100644
--- a/src/proc_net_rpc_nfsd.c
+++ b/src/proc_net_rpc_nfsd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_sctp_snmp.c b/src/proc_net_sctp_snmp.c
index ac9984e26b..3f23189aa9 100644
--- a/src/proc_net_sctp_snmp.c
+++ b/src/proc_net_sctp_snmp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_snmp.c b/src/proc_net_snmp.c
index dac075fa82..2f8bcf60cc 100644
--- a/src/proc_net_snmp.c
+++ b/src/proc_net_snmp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_snmp6.c b/src/proc_net_snmp6.c
index 2a5a8ac662..3f4dd52898 100644
--- a/src/proc_net_snmp6.c
+++ b/src/proc_net_snmp6.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_sockstat.c b/src/proc_net_sockstat.c
index 11eca3524c..5287287a74 100644
--- a/src/proc_net_sockstat.c
+++ b/src/proc_net_sockstat.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_sockstat6.c b/src/proc_net_sockstat6.c
index a281debb0e..8001b9be92 100644
--- a/src/proc_net_sockstat6.c
+++ b/src/proc_net_sockstat6.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_softnet_stat.c b/src/proc_net_softnet_stat.c
index 2b8a6c4324..fa609cf304 100644
--- a/src/proc_net_softnet_stat.c
+++ b/src/proc_net_softnet_stat.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_stat_conntrack.c b/src/proc_net_stat_conntrack.c
index 0aa23351f9..b946501af4 100644
--- a/src/proc_net_stat_conntrack.c
+++ b/src/proc_net_stat_conntrack.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_net_stat_synproxy.c b/src/proc_net_stat_synproxy.c
index 3aeb813c31..3ce554c951 100644
--- a/src/proc_net_stat_synproxy.c
+++ b/src/proc_net_stat_synproxy.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_self_mountinfo.c b/src/proc_self_mountinfo.c
index 94462b86b7..47ff8dc76f 100644
--- a/src/proc_self_mountinfo.c
+++ b/src/proc_self_mountinfo.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_self_mountinfo.h b/src/proc_self_mountinfo.h
index 4658dbd1bc..15d63c7868 100644
--- a/src/proc_self_mountinfo.h
+++ b/src/proc_self_mountinfo.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_PROC_SELF_MOUNTINFO_H
#define NETDATA_PROC_SELF_MOUNTINFO_H 1
diff --git a/src/proc_softirqs.c b/src/proc_softirqs.c
index 96e11988e1..46309ee6b7 100644
--- a/src/proc_softirqs.c
+++ b/src/proc_softirqs.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_spl_kstat_zfs.c b/src/proc_spl_kstat_zfs.c
index 9a78fdf8f7..7b6f8a2201 100644
--- a/src/proc_spl_kstat_zfs.c
+++ b/src/proc_spl_kstat_zfs.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include "zfs_common.h"
diff --git a/src/proc_stat.c b/src/proc_stat.c
index a40d7f5915..ea9c88a1fb 100644
--- a/src/proc_stat.c
+++ b/src/proc_stat.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_sys_kernel_random_entropy_avail.c b/src/proc_sys_kernel_random_entropy_avail.c
index 6a7dec7467..d44c783412 100644
--- a/src/proc_sys_kernel_random_entropy_avail.c
+++ b/src/proc_sys_kernel_random_entropy_avail.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_uptime.c b/src/proc_uptime.c
index 65d0d739ea..c8f2cf607c 100644
--- a/src/proc_uptime.c
+++ b/src/proc_uptime.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/proc_vmstat.c b/src/proc_vmstat.c
index 13855dc45e..c09167d3ef 100644
--- a/src/proc_vmstat.c
+++ b/src/proc_vmstat.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/procfile.c b/src/procfile.c
index f5ffb92629..96e38adbc7 100644
--- a/src/procfile.c
+++ b/src/procfile.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/procfile.h b/src/procfile.h
index 09b1096d8e..c9eb6b2235 100644
--- a/src/procfile.h
+++ b/src/procfile.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
/*
* procfile is a library for reading kernel files from /proc
*
diff --git a/src/registry.c b/src/registry.c
index 52bde95181..59b8443f97 100644
--- a/src/registry.c
+++ b/src/registry.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include "registry_internals.h"
diff --git a/src/registry.h b/src/registry.h
index 0ab8e99a63..5e67717c0a 100644
--- a/src/registry.h
+++ b/src/registry.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
/*
* netdata registry
*
diff --git a/src/registry_db.c b/src/registry_db.c
index 9ef19ef6cd..bfd2838045 100644
--- a/src/registry_db.c
+++ b/src/registry_db.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include "registry_internals.h"
diff --git a/src/registry_init.c b/src/registry_init.c
index 8370ee9196..6406d9acaf 100644
--- a/src/registry_init.c
+++ b/src/registry_init.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include "registry_internals.h"
diff --git a/src/registry_internals.c b/src/registry_internals.c
index f9b5f084b7..85652f1329 100644
--- a/src/registry_internals.c
+++ b/src/registry_internals.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include "registry_internals.h"
diff --git a/src/registry_internals.h b/src/registry_internals.h
index 9595e5aff0..fa40e100d5 100644
--- a/src/registry_internals.h
+++ b/src/registry_internals.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_REGISTRY_INTERNALS_H_H
#define NETDATA_REGISTRY_INTERNALS_H_H 1
diff --git a/src/registry_log.c b/src/registry_log.c
index e8487b86e5..a090e0fb0c 100644
--- a/src/registry_log.c
+++ b/src/registry_log.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include "registry_internals.h"
diff --git a/src/registry_machine.c b/src/registry_machine.c
index baf5cf4a82..9fc973dcbb 100644
--- a/src/registry_machine.c
+++ b/src/registry_machine.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include "registry_internals.h"
diff --git a/src/registry_machine.h b/src/registry_machine.h
index 7421cbea3a..e208300dde 100644
--- a/src/registry_machine.h
+++ b/src/registry_machine.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_REGISTRY_MACHINE_H
#define NETDATA_REGISTRY_MACHINE_H 1
diff --git a/src/registry_person.c b/src/registry_person.c
index 0124ba1375..5582a361c3 100644
--- a/src/registry_person.c
+++ b/src/registry_person.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include "registry_internals.h"
diff --git a/src/registry_person.h b/src/registry_person.h
index 513a5d7eb1..551f9212ed 100644
--- a/src/registry_person.h
+++ b/src/registry_person.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_REGISTRY_PERSON_H
#define NETDATA_REGISTRY_PERSON_H 1
diff --git a/src/registry_url.c b/src/registry_url.c
index 15557e3977..3dc7d64bf7 100644
--- a/src/registry_url.c
+++ b/src/registry_url.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include "registry_internals.h"
diff --git a/src/registry_url.h b/src/registry_url.h
index 0dbc9eed29..e612a7a363 100644
--- a/src/registry_url.h
+++ b/src/registry_url.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_REGISTRY_URL_H
#define NETDATA_REGISTRY_URL_H 1
diff --git a/src/rrd.c b/src/rrd.c
index be4afd1f22..231cff7ba9 100644
--- a/src/rrd.c
+++ b/src/rrd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_RRD_INTERNALS 1
#include "common.h"
diff --git a/src/rrd.h b/src/rrd.h
index d67d84f5af..bf77ea1975 100644
--- a/src/rrd.h
+++ b/src/rrd.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_RRD_H
#define NETDATA_RRD_H 1
diff --git a/src/rrd2json.c b/src/rrd2json.c
index 3ed7355391..7920cb85e5 100644
--- a/src/rrd2json.c
+++ b/src/rrd2json.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/rrd2json.h b/src/rrd2json.h
index d74d075b7f..b65b4ac5fe 100644
--- a/src/rrd2json.h
+++ b/src/rrd2json.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_RRD2JSON_H
#define NETDATA_RRD2JSON_H 1
diff --git a/src/rrdcalc.c b/src/rrdcalc.c
index 08994ad8d9..d7d98adf36 100644
--- a/src/rrdcalc.c
+++ b/src/rrdcalc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_HEALTH_INTERNALS
#include "common.h"
diff --git a/src/rrdcalctemplate.c b/src/rrdcalctemplate.c
index b55bb76397..f33a4c51c8 100644
--- a/src/rrdcalctemplate.c
+++ b/src/rrdcalctemplate.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_HEALTH_INTERNALS
#include "common.h"
diff --git a/src/rrddim.c b/src/rrddim.c
index de429283d8..8d32eed2eb 100644
--- a/src/rrddim.c
+++ b/src/rrddim.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_RRD_INTERNALS 1
#include "common.h"
diff --git a/src/rrddimvar.c b/src/rrddimvar.c
index 88be622759..8fea0f59cd 100644
--- a/src/rrddimvar.c
+++ b/src/rrddimvar.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_HEALTH_INTERNALS
#include "common.h"
diff --git a/src/rrdfamily.c b/src/rrdfamily.c
index 30644d7092..deb17a8503 100644
--- a/src/rrdfamily.c
+++ b/src/rrdfamily.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_RRD_INTERNALS 1
#include "common.h"
diff --git a/src/rrdhost.c b/src/rrdhost.c
index 97a64449fb..35f5382a3b 100644
--- a/src/rrdhost.c
+++ b/src/rrdhost.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_RRD_INTERNALS 1
#include "common.h"
diff --git a/src/rrdpush.c b/src/rrdpush.c
index 7e28763967..db153ce9ec 100644
--- a/src/rrdpush.c
+++ b/src/rrdpush.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/rrdpush.h b/src/rrdpush.h
index 42abfda22f..50dab56115 100644
--- a/src/rrdpush.h
+++ b/src/rrdpush.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_RRDPUSH_H
#define NETDATA_RRDPUSH_H 1
diff --git a/src/rrdset.c b/src/rrdset.c
index 898827a0af..10c5a30a6c 100644
--- a/src/rrdset.c
+++ b/src/rrdset.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_RRD_INTERNALS 1
#include "common.h"
diff --git a/src/rrdsetvar.c b/src/rrdsetvar.c
index 78e38a798f..6b08f0abe1 100644
--- a/src/rrdsetvar.c
+++ b/src/rrdsetvar.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_HEALTH_INTERNALS
#include "common.h"
diff --git a/src/rrdvar.c b/src/rrdvar.c
index 3437b2eb86..c375cfc7e2 100644
--- a/src/rrdvar.c
+++ b/src/rrdvar.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#define NETDATA_HEALTH_INTERNALS
#include "common.h"
diff --git a/src/signals.c b/src/signals.c
index dbd796b683..71f271887c 100644
--- a/src/signals.c
+++ b/src/signals.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/signals.h b/src/signals.h
index 866ffe3ae2..e7e64365dc 100644
--- a/src/signals.h
+++ b/src/signals.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_SIGNALS_H
#define NETDATA_SIGNALS_H 1
diff --git a/src/simple_pattern.c b/src/simple_pattern.c
index 90ad56b52e..346ff6f51a 100644
--- a/src/simple_pattern.c
+++ b/src/simple_pattern.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/simple_pattern.h b/src/simple_pattern.h
index 14433ab304..f708f1916f 100644
--- a/src/simple_pattern.h
+++ b/src/simple_pattern.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_SIMPLE_PATTERN_H
#define NETDATA_SIMPLE_PATTERN_H
diff --git a/src/socket.c b/src/socket.c
index bcf9953149..2c6e601828 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/socket.h b/src/socket.h
index 49d21ef95a..d1d2f2e8f1 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_SOCKET_H
#define NETDATA_SOCKET_H
diff --git a/src/statistical.c b/src/statistical.c
index 922937cc6c..2951f0b31d 100644
--- a/src/statistical.c
+++ b/src/statistical.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/statistical.h b/src/statistical.h
index 26b3df5ad9..588550a9a0 100644
--- a/src/statistical.h
+++ b/src/statistical.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_STATISTICAL_H
#define NETDATA_STATISTICAL_H 1
diff --git a/src/statsd.c b/src/statsd.c
index 1119087125..9237ba8f71 100644
--- a/src/statsd.c
+++ b/src/statsd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/statsd.h b/src/statsd.h
index 2c12319300..a7f9e2b074 100644
--- a/src/statsd.h
+++ b/src/statsd.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_STATSD_H
#define NETDATA_STATSD_H 1
diff --git a/src/storage_number.c b/src/storage_number.c
index b1ca4554ff..55089e9f4f 100644
--- a/src/storage_number.c
+++ b/src/storage_number.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/storage_number.h b/src/storage_number.h
index 8857793271..ace81e2ebe 100644
--- a/src/storage_number.h
+++ b/src/storage_number.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_STORAGE_NUMBER_H
#define NETDATA_STORAGE_NUMBER_H 1
diff --git a/src/sys_devices_system_edac_mc.c b/src/sys_devices_system_edac_mc.c
index 8026ef86cf..a86fd0bb30 100644
--- a/src/sys_devices_system_edac_mc.c
+++ b/src/sys_devices_system_edac_mc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/sys_devices_system_node.c b/src/sys_devices_system_node.c
index 767429438b..4d0f7a1521 100644
--- a/src/sys_devices_system_node.c
+++ b/src/sys_devices_system_node.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/sys_fs_btrfs.c b/src/sys_fs_btrfs.c
index e9a6ac2bf0..c42f19c77d 100644
--- a/src/sys_fs_btrfs.c
+++ b/src/sys_fs_btrfs.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/sys_fs_cgroup.c b/src/sys_fs_cgroup.c
index 311f2f5afa..3c4e891f5e 100644
--- a/src/sys_fs_cgroup.c
+++ b/src/sys_fs_cgroup.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/sys_kernel_mm_ksm.c b/src/sys_kernel_mm_ksm.c
index 6a9935ad3b..f778202cf1 100644
--- a/src/sys_kernel_mm_ksm.c
+++ b/src/sys_kernel_mm_ksm.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/threads.c b/src/threads.c
index 213977961e..af090096e8 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/threads.h b/src/threads.h
index 85270aa59f..8dccaeff2e 100644
--- a/src/threads.h
+++ b/src/threads.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_THREADS_H
#define NETDATA_THREADS_H 1
diff --git a/src/unit_test.c b/src/unit_test.c
index 74a2002633..9978647b43 100644
--- a/src/unit_test.c
+++ b/src/unit_test.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/unit_test.h b/src/unit_test.h
index a7c9bc2a0a..0023c8de97 100644
--- a/src/unit_test.h
+++ b/src/unit_test.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_UNIT_TEST_H
#define NETDATA_UNIT_TEST_H 1
diff --git a/src/url.c b/src/url.c
index 3388ac67e2..6b809f0027 100644
--- a/src/url.c
+++ b/src/url.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/url.h b/src/url.h
index 23b5aadb29..d9239c215a 100644
--- a/src/url.h
+++ b/src/url.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_URL_H
#define NETDATA_URL_H 1
diff --git a/src/web_api_v1.c b/src/web_api_v1.c
index 3a17c66c5f..7df23aa0f5 100644
--- a/src/web_api_v1.c
+++ b/src/web_api_v1.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/web_api_v1.h b/src/web_api_v1.h
index f0010380c6..344e8edd56 100644
--- a/src/web_api_v1.h
+++ b/src/web_api_v1.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_WEB_API_V1_H
#define NETDATA_WEB_API_V1_H 1
diff --git a/src/web_buffer.c b/src/web_buffer.c
index f11dc1d171..5206608a57 100644
--- a/src/web_buffer.c
+++ b/src/web_buffer.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/web_buffer.h b/src/web_buffer.h
index 26692d0a0e..f051ecbd0a 100644
--- a/src/web_buffer.h
+++ b/src/web_buffer.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_WEB_BUFFER_H
#define NETDATA_WEB_BUFFER_H 1
diff --git a/src/web_buffer_svg.c b/src/web_buffer_svg.c
index 19ee5c7f97..721e25c56a 100644
--- a/src/web_buffer_svg.c
+++ b/src/web_buffer_svg.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/web_buffer_svg.h b/src/web_buffer_svg.h
index c0a62d53ff..b829f073f5 100644
--- a/src/web_buffer_svg.h
+++ b/src/web_buffer_svg.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_WEB_BUFFER_SVG_H
#define NETDATA_WEB_BUFFER_SVG_H 1
diff --git a/src/web_client.c b/src/web_client.c
index b2ab63eacc..b9a1819452 100644
--- a/src/web_client.c
+++ b/src/web_client.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/web_client.h b/src/web_client.h
index aae6efb43b..cc90dbad04 100644
--- a/src/web_client.h
+++ b/src/web_client.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_WEB_CLIENT_H
#define NETDATA_WEB_CLIENT_H 1
diff --git a/src/web_server.c b/src/web_server.c
index bac7af24d8..ec2cc18ccb 100644
--- a/src/web_server.c
+++ b/src/web_server.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
diff --git a/src/web_server.h b/src/web_server.h
index c9d990d27d..c06cafeb3b 100644
--- a/src/web_server.h
+++ b/src/web_server.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_WEB_SERVER_H
#define NETDATA_WEB_SERVER_H 1
diff --git a/src/zfs_common.c b/src/zfs_common.c
index 894fe1d286..ef2ef190f6 100644
--- a/src/zfs_common.c
+++ b/src/zfs_common.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "common.h"
#include "zfs_common.h"
diff --git a/src/zfs_common.h b/src/zfs_common.h
index 46a79a308b..ebce25ce5c 100644
--- a/src/zfs_common.h
+++ b/src/zfs_common.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef NETDATA_ZFS_COMMON_H
#define NETDATA_ZFS_COMMON_H 1
diff --git a/system/Makefile.am b/system/Makefile.am
index 79240ed7d6..9300583b85 100644
--- a/system/Makefile.am
+++ b/system/Makefile.am
@@ -1,6 +1,6 @@
#
# Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
CLEANFILES = \
diff --git a/system/netdata-freebsd.in b/system/netdata-freebsd.in
index ff716dc977..300ddc9ec6 100644
--- a/system/netdata-freebsd.in
+++ b/system/netdata-freebsd.in
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
. /etc/rc.subr
diff --git a/system/netdata-init-d.in b/system/netdata-init-d.in
index 332c80639b..9ac510196b 100644
--- a/system/netdata-init-d.in
+++ b/system/netdata-init-d.in
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# netdata Real-time performance monitoring, done right
# chkconfig: 345 99 01
diff --git a/system/netdata-lsb.in b/system/netdata-lsb.in
index 37cf095d63..e623f1e0cf 100644
--- a/system/netdata-lsb.in
+++ b/system/netdata-lsb.in
@@ -1,5 +1,5 @@
#!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
### BEGIN INIT INFO
# Provides: netdata
diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
index dffd4c3d1c..e0070526f1 100644
--- a/system/netdata-openrc.in
+++ b/system/netdata-openrc.in
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# The user netdata is configured to run as.
# If you edit its configuration file to set a different
diff --git a/system/netdata.plist.in b/system/netdata.plist.in
index f701f1fa4c..a969b31775 100644
--- a/system/netdata.plist.in
+++ b/system/netdata.plist.in
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<plist version="1.0">
<dict>
<key>Label</key>
diff --git a/system/netdata.service.in b/system/netdata.service.in
index e872afed5d..dd0ee3cca9 100644
--- a/system/netdata.service.in
+++ b/system/netdata.service.in
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
[Unit]
Description=Real time performance monitoring
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8ff8d18c66..3a0246d08f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
dist_noinst_DATA = \
diff --git a/tests/node.d/fronius.chart.spec.js b/tests/node.d/fronius.chart.spec.js
index 63d322aefe..92e88d2eeb 100644
--- a/tests/node.d/fronius.chart.spec.js
+++ b/tests/node.d/fronius.chart.spec.js
@@ -1,5 +1,5 @@
"use strict";
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
var netdata = require("../../node.d/node_modules/netdata");
// remember: subject will be a singleton!
diff --git a/tests/node.d/fronius.parse.spec.js b/tests/node.d/fronius.parse.spec.js
index 69397668a5..e6f308fe3c 100644
--- a/tests/node.d/fronius.parse.spec.js
+++ b/tests/node.d/fronius.parse.spec.js
@@ -1,5 +1,5 @@
"use strict";
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
var netdata = require("../../node.d/node_modules/netdata");
// remember: subject will be a singleton!
diff --git a/tests/node.d/fronius.process.spec.js b/tests/node.d/fronius.process.spec.js
index f7aad41f78..141fa8a6aa 100644
--- a/tests/node.d/fronius.process.spec.js
+++ b/tests/node.d/fronius.process.spec.js
@@ -1,5 +1,5 @@
"use strict";
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
var netdata = require("../../node.d/node_modules/netdata");
// remember: subject will be a singleton!
diff --git a/tests/node.d/fronius.validation.spec.js b/tests/node.d/fronius.validation.spec.js
index bc98939158..b7938d52f0 100644
--- a/tests/node.d/fronius.validation.spec.js
+++ b/tests/node.d/fronius.validation.spec.js
@@ -1,5 +1,5 @@
"use strict";
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
var netdata = require("../../node.d/node_modules/netdata");
// remember: subject will be a singleton!
diff --git a/tests/profile/Makefile b/tests/profile/Makefile
index 16c6e43bc2..040219e6fd 100644
--- a/tests/profile/Makefile
+++ b/tests/profile/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
COMMON_CFLAGS=-I ../../src/ -I ../../
PROFILE_CFLAGS=-O1 -ggdb -Wall -Wextra
diff --git a/tests/profile/benchmark-dictionary.c b/tests/profile/benchmark-dictionary.c
index ac115442a9..18f26737ad 100644
--- a/tests/profile/benchmark-dictionary.c
+++ b/tests/profile/benchmark-dictionary.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-3.0+ */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
/*
* 1. build netdata (as normally)
* 2. cd tests/profile/
diff --git a/tests/profile/benchmark-line-parsing.c b/tests/profile/benchmark-line-parsing.c
index d1cc0fde28..992c8fd801 100644
--- a/tests/profile/benchmark-line-parsing.c
+++ b/tests/profile/benchmark-line-parsing.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-3.0+ */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
#include <stdio.h>
#include <inttypes.h>
#include <string.h>
diff --git a/tests/profile/benchmark-procfile-parser.c b/tests/profile/benchmark-procfile-parser.c
index 2ec23265dd..4d68f6a44e 100644
--- a/tests/profile/benchmark-procfile-parser.c
+++ b/tests/profile/benchmark-procfile-parser.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-3.0+ */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
#include "config.h"
#include "common.h"
#include "clocks.h"
diff --git a/tests/profile/benchmark-registry.c b/tests/profile/benchmark-registry.c
index efab5850f0..cfed6d7c8d 100755
--- a/tests/profile/benchmark-registry.c
+++ b/tests/profile/benchmark-registry.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-3.0+ */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
/*
* compile with
diff --git a/tests/profile/benchmark-strcmp.c b/tests/profile/benchmark-strcmp.c
index d1cc0fde28..992c8fd801 100644
--- a/tests/profile/benchmark-strcmp.c
+++ b/tests/profile/benchmark-strcmp.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-3.0+ */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
#include <stdio.h>
#include <inttypes.h>
#include <string.h>
diff --git a/tests/profile/statsd-stress.c b/tests/profile/statsd-stress.c
index 977a92d39a..435d58d5c0 100644
--- a/tests/profile/statsd-stress.c
+++ b/tests/profile/statsd-stress.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-3.0+ */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
#include <stdlib.h>
#include <arpa/inet.h>
#include <netinet/in.h>
diff --git a/tests/profile/test-eval.c b/tests/profile/test-eval.c
index 680acc7250..d777c5d221 100644
--- a/tests/profile/test-eval.c
+++ b/tests/profile/test-eval.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-3.0+ */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
/*
* 1. build netdata (as normally)
diff --git a/tests/stress.sh b/tests/stress.sh
index b9af86b07a..9c9393d3b7 100755
--- a/tests/stress.sh
+++ b/tests/stress.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
# set the host to connect to
if [ ! -z "$1" ]
diff --git a/web/Makefile.am b/web/Makefile.am
index abac64792f..81aa0f81d3 100644
--- a/web/Makefile.am
+++ b/web/Makefile.am
@@ -1,6 +1,6 @@
#
# Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
#
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
diff --git a/web/dashboard.css b/web/dashboard.css
index ffb95e6fa8..8062497d06 100644
--- a/web/dashboard.css
+++ b/web/dashboard.css
@@ -1,4 +1,4 @@
-/* SPDX-License-Identfier: GPL-3.0+ */
+/* SPDX-License-Identfier: GPL-3.0-or-later */
html,
body {
/*font-family: Calibri,"Segoe UI","Helvetica Neue",Helvetica,Arial,sans-serif;*/
diff --git a/web/dashboard.html b/web/dashboard.html
index 5b5b4fd67a..4d0685b08e 100644
--- a/web/dashboard.html
+++ b/web/dashboard.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<html lang="en">
<head>
<title>NetData Dashboard</title>
diff --git a/web/dashboard.js b/web/dashboard.js
index a155d2ea69..89ecc0ec9a 100644
--- a/web/dashboard.js
+++ b/web/dashboard.js
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
// ----------------------------------------------------------------------------
// You can set the following variables before loading this script:
diff --git a/web/dashboard.slate.css b/web/dashboard.slate.css
index 058c490373..f1c9c4101c 100644
--- a/web/dashboard.slate.css
+++ b/web/dashboard.slate.css
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-3.0+ */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
html,
body {
/*font-family: Calibri,"Segoe UI","Helvetica Neue",Helvetica,Arial,sans-serif;*/
diff --git a/web/dashboard_info.js b/web/dashboard_info.js
index 46cc315475..64d98f4569 100644
--- a/web/dashboard_info.js
+++ b/web/dashboard_info.js
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
var netdataDashboard = window.netdataDashboard || {};
diff --git a/web/dashboard_info_custom_example.js b/web/dashboard_info_custom_example.js
index 568984dfdd..51ce0be22a 100644
--- a/web/dashboard_info_custom_example.js
+++ b/web/dashboard_info_custom_example.js
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
/*
* Custom netdata information file
* -------------------------------
diff --git a/web/demo.html b/web/demo.html
index e53f55c62b..68f374b658 100644
--- a/web/demo.html
+++ b/web/demo.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<html lang="en">
<head>
<title>NetData Dashboard</title>
diff --git a/web/demo2.html b/web/demo2.html
index d635035c2e..183a9550da 100644
--- a/web/demo2.html
+++ b/web/demo2.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<html lang="en">
<head>
<title>NetData Dashboard</title>
diff --git a/web/demosites.html b/web/demosites.html
index 9d4ebd8d8f..34d3a7af8f 100644
--- a/web/demosites.html
+++ b/web/demosites.html
@@ -1,5 +1,5 @@
<!doctype html>
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<html lang=en-us>
<head>
<meta charset=utf-8>
diff --git a/web/demosites2.html b/web/demosites2.html
index b3d975690d..39520712fa 100644
--- a/web/demosites2.html
+++ b/web/demosites2.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<html lang="en">
<head>
<title>NetData - Real-time performance monitoring, done right!</title>
diff --git a/web/goto-host-from-alarm.html b/web/goto-host-from-alarm.html
index 4800ae8028..1f3875b074 100644
--- a/web/goto-host-from-alarm.html
+++ b/web/goto-host-from-alarm.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<html lang="en">
<head>
<title>Goto a host you know...</title>
diff --git a/web/index.html b/web/index.html
index fe885c542d..e4bceb7bcd 100644
--- a/web/index.html
+++ b/web/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<html lang="en">
<head>
<title>netdata dashboard</title>
diff --git a/web/infographic.html b/web/infographic.html
index 9880de51cb..b3112781b7 100644
--- a/web/infographic.html
+++ b/web/infographic.html
@@ -1,5 +1,5 @@
<!doctype html>
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<html lang=en-us>
<head>
<meta charset=utf-8>
diff --git a/web/netdata-swagger.yaml b/web/netdata-swagger.yaml
index 1e928bc068..db9b58d70f 100644
--- a/web/netdata-swagger.yaml
+++ b/web/netdata-swagger.yaml
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
swagger: '2.0'
info:
title: NetData API
diff --git a/web/refresh-badges.js b/web/refresh-badges.js
index 4b7f7bdf42..00dd4dadf5 100644
--- a/web/refresh-badges.js
+++ b/web/refresh-badges.js
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
// ----------------------------------------------------------------------------
// This script periodically updates all the netdata badges you have added to a
// page as images. You don't need this script if you add the badges with
diff --git a/web/registry.html b/web/registry.html
index af8ebae52a..3be7952e2c 100644
--- a/web/registry.html
+++ b/web/registry.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<html lang="en">
<head>
<title>NetData Registry Dashboard</title>
diff --git a/web/sitemap.xml b/web/sitemap.xml
index 15e632c965..4438e8b35c 100644
--- a/web/sitemap.xml
+++ b/web/sitemap.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://my-netdata.io/</loc>
diff --git a/web/tv.html b/web/tv.html
index 505e6e8b6b..bd549be943 100644
--- a/web/tv.html
+++ b/web/tv.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<!-- SPDX-License-Identifier: GPL-3.0+ -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
<html lang="en">
<head>
<title>NetData TV Dashboard</title>