diff --git a/apps/db_dump/db_dump.c b/apps/db_dump/db_dump.c
index bcc81d1e..c0c1e056 100644
--- a/apps/db_dump/db_dump.c
+++ b/apps/db_dump/db_dump.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/db_dump/db_dump.h b/apps/db_dump/db_dump.h
index d9adc435..86294180 100644
--- a/apps/db_dump/db_dump.h
+++ b/apps/db_dump/db_dump.h
@@ -12,6 +12,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/db_dump/print.c b/apps/db_dump/print.c
index d244afa6..10ab1d38 100644
--- a/apps/db_dump/print.c
+++ b/apps/db_dump/print.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_ctrl/client.c b/apps/mosquitto_ctrl/client.c
index 00d80df8..0d1aa905 100644
--- a/apps/mosquitto_ctrl/client.c
+++ b/apps/mosquitto_ctrl/client.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_ctrl/dynsec.c b/apps/mosquitto_ctrl/dynsec.c
index 63818ccb..142fd9c1 100644
--- a/apps/mosquitto_ctrl/dynsec.c
+++ b/apps/mosquitto_ctrl/dynsec.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_ctrl/dynsec_client.c b/apps/mosquitto_ctrl/dynsec_client.c
index 06aeb34b..1dea7862 100644
--- a/apps/mosquitto_ctrl/dynsec_client.c
+++ b/apps/mosquitto_ctrl/dynsec_client.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_ctrl/dynsec_group.c b/apps/mosquitto_ctrl/dynsec_group.c
index 17efaf63..b0faf27b 100644
--- a/apps/mosquitto_ctrl/dynsec_group.c
+++ b/apps/mosquitto_ctrl/dynsec_group.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_ctrl/dynsec_role.c b/apps/mosquitto_ctrl/dynsec_role.c
index 073b13c2..13ceb5c4 100644
--- a/apps/mosquitto_ctrl/dynsec_role.c
+++ b/apps/mosquitto_ctrl/dynsec_role.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_ctrl/example.c b/apps/mosquitto_ctrl/example.c
index 1c51d780..63ba3eb0 100644
--- a/apps/mosquitto_ctrl/example.c
+++ b/apps/mosquitto_ctrl/example.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_ctrl/mosquitto_ctrl.c b/apps/mosquitto_ctrl/mosquitto_ctrl.c
index 326404f7..6ee729c2 100644
--- a/apps/mosquitto_ctrl/mosquitto_ctrl.c
+++ b/apps/mosquitto_ctrl/mosquitto_ctrl.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_ctrl/mosquitto_ctrl.h b/apps/mosquitto_ctrl/mosquitto_ctrl.h
index 546def4a..52bbc9a8 100644
--- a/apps/mosquitto_ctrl/mosquitto_ctrl.h
+++ b/apps/mosquitto_ctrl/mosquitto_ctrl.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_ctrl/options.c b/apps/mosquitto_ctrl/options.c
index 1e84cfd7..de77aaa5 100644
--- a/apps/mosquitto_ctrl/options.c
+++ b/apps/mosquitto_ctrl/options.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_passwd/get_password.c b/apps/mosquitto_passwd/get_password.c
index 3de7d1bc..a3113d1a 100644
--- a/apps/mosquitto_passwd/get_password.c
+++ b/apps/mosquitto_passwd/get_password.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_passwd/get_password.h b/apps/mosquitto_passwd/get_password.h
index 9c4f63e7..f62afd0d 100644
--- a/apps/mosquitto_passwd/get_password.h
+++ b/apps/mosquitto_passwd/get_password.h
@@ -12,6 +12,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/apps/mosquitto_passwd/mosquitto_passwd.c b/apps/mosquitto_passwd/mosquitto_passwd.c
index 653c43d9..94162714 100644
--- a/apps/mosquitto_passwd/mosquitto_passwd.c
+++ b/apps/mosquitto_passwd/mosquitto_passwd.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/client/client_props.c b/client/client_props.c
index 1e28baf5..0c34e3a5 100644
--- a/client/client_props.c
+++ b/client/client_props.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/client/client_shared.c b/client/client_shared.c
index 14fa3c63..03d518c1 100644
--- a/client/client_shared.c
+++ b/client/client_shared.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/client/client_shared.h b/client/client_shared.h
index 1e80b10c..8fb9c624 100644
--- a/client/client_shared.h
+++ b/client/client_shared.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/client/pub_client.c b/client/pub_client.c
index 618557ec..9f276c63 100644
--- a/client/pub_client.c
+++ b/client/pub_client.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/client/pub_shared.c b/client/pub_shared.c
index 9eb1fdfe..2718c4eb 100644
--- a/client/pub_shared.c
+++ b/client/pub_shared.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/client/pub_shared.h b/client/pub_shared.h
index 8432f8fd..023d91a9 100644
--- a/client/pub_shared.h
+++ b/client/pub_shared.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/client/rr_client.c b/client/rr_client.c
index e60f47a9..edaed70a 100644
--- a/client/rr_client.c
+++ b/client/rr_client.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/client/sub_client.c b/client/sub_client.c
index 8412972c..23cdd773 100644
--- a/client/sub_client.c
+++ b/client/sub_client.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/client/sub_client_output.c b/client/sub_client_output.c
index 1bbc2971..936cdec9 100644
--- a/client/sub_client_output.c
+++ b/client/sub_client_output.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/client/sub_client_output.h b/client/sub_client_output.h
index 8170db8d..17abb1dc 100644
--- a/client/sub_client_output.h
+++ b/client/sub_client_output.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/include/mosquitto.h b/include/mosquitto.h
index 882dba89..0866324d 100644
--- a/include/mosquitto.h
+++ b/include/mosquitto.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/include/mosquitto_broker.h b/include/mosquitto_broker.h
index bf65aec0..f1c82498 100644
--- a/include/mosquitto_broker.h
+++ b/include/mosquitto_broker.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/include/mosquitto_plugin.h b/include/mosquitto_plugin.h
index 98197ba3..b36f6bb6 100644
--- a/include/mosquitto_plugin.h
+++ b/include/mosquitto_plugin.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/include/mqtt_protocol.h b/include/mqtt_protocol.h
index f6e0f93f..a2a55e89 100644
--- a/include/mqtt_protocol.h
+++ b/include/mqtt_protocol.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/actions.c b/lib/actions.c
index da72482b..4f7ff012 100644
--- a/lib/actions.c
+++ b/lib/actions.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/alias_mosq.c b/lib/alias_mosq.c
index 3b5b772b..522a3650 100644
--- a/lib/alias_mosq.c
+++ b/lib/alias_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/alias_mosq.h b/lib/alias_mosq.h
index 0cd86bac..67e2520c 100644
--- a/lib/alias_mosq.h
+++ b/lib/alias_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/callbacks.c b/lib/callbacks.c
index 88582451..ea770eee 100644
--- a/lib/callbacks.c
+++ b/lib/callbacks.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/connect.c b/lib/connect.c
index 8301724c..4a0d1eec 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/handle_auth.c b/lib/handle_auth.c
index 7a550146..33130ca3 100644
--- a/lib/handle_auth.c
+++ b/lib/handle_auth.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/handle_connack.c b/lib/handle_connack.c
index 11b03657..7cf50952 100644
--- a/lib/handle_connack.c
+++ b/lib/handle_connack.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/handle_disconnect.c b/lib/handle_disconnect.c
index 7e4bf734..4d1ac479 100644
--- a/lib/handle_disconnect.c
+++ b/lib/handle_disconnect.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/handle_ping.c b/lib/handle_ping.c
index d2b24fae..c8c0a5f5 100644
--- a/lib/handle_ping.c
+++ b/lib/handle_ping.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/handle_pubackcomp.c b/lib/handle_pubackcomp.c
index 08cfdbd2..fe154daa 100644
--- a/lib/handle_pubackcomp.c
+++ b/lib/handle_pubackcomp.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/handle_publish.c b/lib/handle_publish.c
index 7c778fc9..502ea673 100644
--- a/lib/handle_publish.c
+++ b/lib/handle_publish.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/handle_pubrec.c b/lib/handle_pubrec.c
index c3322ded..21e718d4 100644
--- a/lib/handle_pubrec.c
+++ b/lib/handle_pubrec.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/handle_pubrel.c b/lib/handle_pubrel.c
index 240bd48d..3c98a576 100644
--- a/lib/handle_pubrel.c
+++ b/lib/handle_pubrel.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/handle_suback.c b/lib/handle_suback.c
index d5d38b1c..0d20c28a 100644
--- a/lib/handle_suback.c
+++ b/lib/handle_suback.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/handle_unsuback.c b/lib/handle_unsuback.c
index 6980c796..5e8079dc 100644
--- a/lib/handle_unsuback.c
+++ b/lib/handle_unsuback.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/helpers.c b/lib/helpers.c
index c3ec3efe..05149201 100644
--- a/lib/helpers.c
+++ b/lib/helpers.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/logging_mosq.c b/lib/logging_mosq.c
index 5b024317..adddc28b 100644
--- a/lib/logging_mosq.c
+++ b/lib/logging_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/logging_mosq.h b/lib/logging_mosq.h
index 4fae3883..17b49a60 100644
--- a/lib/logging_mosq.h
+++ b/lib/logging_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/loop.c b/lib/loop.c
index 68db8d61..0fc7a69e 100644
--- a/lib/loop.c
+++ b/lib/loop.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/memory_mosq.c b/lib/memory_mosq.c
index 11e578d5..73f9901a 100644
--- a/lib/memory_mosq.c
+++ b/lib/memory_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/memory_mosq.h b/lib/memory_mosq.h
index 867e8dfc..85d77492 100644
--- a/lib/memory_mosq.h
+++ b/lib/memory_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/messages_mosq.c b/lib/messages_mosq.c
index 19e31cb5..e0dfb3f9 100644
--- a/lib/messages_mosq.c
+++ b/lib/messages_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/messages_mosq.h b/lib/messages_mosq.h
index f7c74f19..6a66a50c 100644
--- a/lib/messages_mosq.h
+++ b/lib/messages_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/misc_mosq.c b/lib/misc_mosq.c
index c5e66dc0..f092527f 100644
--- a/lib/misc_mosq.c
+++ b/lib/misc_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/misc_mosq.h b/lib/misc_mosq.h
index 6e05e187..6456c02b 100644
--- a/lib/misc_mosq.h
+++ b/lib/misc_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/mosquitto.c b/lib/mosquitto.c
index 11149956..2af233d7 100644
--- a/lib/mosquitto.c
+++ b/lib/mosquitto.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/mosquitto_internal.h b/lib/mosquitto_internal.h
index 18b7eb49..14073619 100644
--- a/lib/mosquitto_internal.h
+++ b/lib/mosquitto_internal.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
    Tatsuzo Osawa - Add epoll.
diff --git a/lib/net_mosq.c b/lib/net_mosq.c
index fc296f63..0d961a46 100644
--- a/lib/net_mosq.c
+++ b/lib/net_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/net_mosq.h b/lib/net_mosq.h
index 8c530fc0..cc4f2fef 100644
--- a/lib/net_mosq.h
+++ b/lib/net_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/net_mosq_ocsp.c b/lib/net_mosq_ocsp.c
index 9ec33456..371c873c 100644
--- a/lib/net_mosq_ocsp.c
+++ b/lib/net_mosq_ocsp.c
@@ -11,6 +11,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Dr. Lars Voelker, BMW AG
 */
diff --git a/lib/options.c b/lib/options.c
index 68354cec..8fe1007d 100644
--- a/lib/options.c
+++ b/lib/options.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/packet_datatypes.c b/lib/packet_datatypes.c
index 795e6e03..7a195d19 100644
--- a/lib/packet_datatypes.c
+++ b/lib/packet_datatypes.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/packet_mosq.c b/lib/packet_mosq.c
index 7b0aff25..6403a12b 100644
--- a/lib/packet_mosq.c
+++ b/lib/packet_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/packet_mosq.h b/lib/packet_mosq.h
index b5b10b1e..cbdbb68e 100644
--- a/lib/packet_mosq.h
+++ b/lib/packet_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/property_mosq.c b/lib/property_mosq.c
index 4109df01..ef8ffc80 100644
--- a/lib/property_mosq.c
+++ b/lib/property_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/property_mosq.h b/lib/property_mosq.h
index 75fb9fe6..c0110909 100644
--- a/lib/property_mosq.h
+++ b/lib/property_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/read_handle.c b/lib/read_handle.c
index 0f6eadd9..72ff7555 100644
--- a/lib/read_handle.c
+++ b/lib/read_handle.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/read_handle.h b/lib/read_handle.h
index d1448e82..b687fea3 100644
--- a/lib/read_handle.h
+++ b/lib/read_handle.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/send_connect.c b/lib/send_connect.c
index ac4f012b..8e070a11 100644
--- a/lib/send_connect.c
+++ b/lib/send_connect.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/send_disconnect.c b/lib/send_disconnect.c
index 0163f9b2..2d2d7932 100644
--- a/lib/send_disconnect.c
+++ b/lib/send_disconnect.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/send_mosq.c b/lib/send_mosq.c
index 8e519041..da348c89 100644
--- a/lib/send_mosq.c
+++ b/lib/send_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/send_mosq.h b/lib/send_mosq.h
index d9f888e0..90274c67 100644
--- a/lib/send_mosq.h
+++ b/lib/send_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/send_publish.c b/lib/send_publish.c
index 6f4fe2c5..e2cec9cf 100644
--- a/lib/send_publish.c
+++ b/lib/send_publish.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/send_subscribe.c b/lib/send_subscribe.c
index 375e3a7e..c030ee10 100644
--- a/lib/send_subscribe.c
+++ b/lib/send_subscribe.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/send_unsubscribe.c b/lib/send_unsubscribe.c
index ada9a0e3..27e612cf 100644
--- a/lib/send_unsubscribe.c
+++ b/lib/send_unsubscribe.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/socks_mosq.c b/lib/socks_mosq.c
index 43a4e15a..13b3c0ed 100644
--- a/lib/socks_mosq.c
+++ b/lib/socks_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/socks_mosq.h b/lib/socks_mosq.h
index 50685d34..6a1f3368 100644
--- a/lib/socks_mosq.h
+++ b/lib/socks_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/srv_mosq.c b/lib/srv_mosq.c
index be97e015..049b6cff 100644
--- a/lib/srv_mosq.c
+++ b/lib/srv_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/strings_mosq.c b/lib/strings_mosq.c
index 8d7c76f3..b3a75bd1 100644
--- a/lib/strings_mosq.c
+++ b/lib/strings_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/thread_mosq.c b/lib/thread_mosq.c
index ca3fceb7..1e56aed1 100644
--- a/lib/thread_mosq.c
+++ b/lib/thread_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/time_mosq.c b/lib/time_mosq.c
index 739294e9..de8679b2 100644
--- a/lib/time_mosq.c
+++ b/lib/time_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/time_mosq.h b/lib/time_mosq.h
index 9afd45a6..8300289b 100644
--- a/lib/time_mosq.h
+++ b/lib/time_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/tls_mosq.c b/lib/tls_mosq.c
index 8b5c83c1..96f444d5 100644
--- a/lib/tls_mosq.c
+++ b/lib/tls_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/tls_mosq.h b/lib/tls_mosq.h
index 1a2b2267..61020d4a 100644
--- a/lib/tls_mosq.h
+++ b/lib/tls_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/utf8_mosq.c b/lib/utf8_mosq.c
index 2afae48e..e0c841d5 100644
--- a/lib/utf8_mosq.c
+++ b/lib/utf8_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation.
 */
diff --git a/lib/util_mosq.c b/lib/util_mosq.c
index 2bf3f2e8..2d44e4e9 100644
--- a/lib/util_mosq.c
+++ b/lib/util_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/util_mosq.h b/lib/util_mosq.h
index 86778553..abb197d1 100644
--- a/lib/util_mosq.h
+++ b/lib/util_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/util_topic.c b/lib/util_topic.c
index b2cf29fb..03917b10 100644
--- a/lib/util_topic.c
+++ b/lib/util_topic.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/will_mosq.c b/lib/will_mosq.c
index 57337b92..6b5e0021 100644
--- a/lib/will_mosq.c
+++ b/lib/will_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/lib/will_mosq.h b/lib/will_mosq.h
index f88e59e7..d7c8a199 100644
--- a/lib/will_mosq.h
+++ b/lib/will_mosq.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/acl.c b/plugins/dynamic-security/acl.c
index 0e97d3fb..cc8558eb 100644
--- a/plugins/dynamic-security/acl.c
+++ b/plugins/dynamic-security/acl.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/auth.c b/plugins/dynamic-security/auth.c
index 2d7b8085..901f6890 100644
--- a/plugins/dynamic-security/auth.c
+++ b/plugins/dynamic-security/auth.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/clientlist.c b/plugins/dynamic-security/clientlist.c
index 0aa32aa9..97957e07 100644
--- a/plugins/dynamic-security/clientlist.c
+++ b/plugins/dynamic-security/clientlist.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/clients.c b/plugins/dynamic-security/clients.c
index 3708af2a..5ae03b47 100644
--- a/plugins/dynamic-security/clients.c
+++ b/plugins/dynamic-security/clients.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/dynamic_security.h b/plugins/dynamic-security/dynamic_security.h
index 4f0d0b97..fcf39579 100644
--- a/plugins/dynamic-security/dynamic_security.h
+++ b/plugins/dynamic-security/dynamic_security.h
@@ -12,6 +12,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/grouplist.c b/plugins/dynamic-security/grouplist.c
index d27f5251..85df7199 100644
--- a/plugins/dynamic-security/grouplist.c
+++ b/plugins/dynamic-security/grouplist.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/groups.c b/plugins/dynamic-security/groups.c
index c4fa70b1..5157113a 100644
--- a/plugins/dynamic-security/groups.c
+++ b/plugins/dynamic-security/groups.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/json_help.c b/plugins/dynamic-security/json_help.c
index 263db4da..04e5b3cf 100644
--- a/plugins/dynamic-security/json_help.c
+++ b/plugins/dynamic-security/json_help.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/json_help.h b/plugins/dynamic-security/json_help.h
index bfb77b86..f80f1447 100644
--- a/plugins/dynamic-security/json_help.h
+++ b/plugins/dynamic-security/json_help.h
@@ -12,6 +12,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/plugin.c b/plugins/dynamic-security/plugin.c
index 27da43a0..76aae115 100644
--- a/plugins/dynamic-security/plugin.c
+++ b/plugins/dynamic-security/plugin.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/rolelist.c b/plugins/dynamic-security/rolelist.c
index 0f1f36a4..f2c4cda2 100644
--- a/plugins/dynamic-security/rolelist.c
+++ b/plugins/dynamic-security/rolelist.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/roles.c b/plugins/dynamic-security/roles.c
index 209900e3..7b33bdc0 100644
--- a/plugins/dynamic-security/roles.c
+++ b/plugins/dynamic-security/roles.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/dynamic-security/sub_matches_sub.c b/plugins/dynamic-security/sub_matches_sub.c
index 118d632f..79701879 100644
--- a/plugins/dynamic-security/sub_matches_sub.c
+++ b/plugins/dynamic-security/sub_matches_sub.c
@@ -1,3 +1,21 @@
+/*
+Copyright (c) 2020 Roger Light <roger@atchoo.org>
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License 2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+   https://www.eclipse.org/legal/epl-2.0/
+and the Eclipse Distribution License is available at
+  http://www.eclipse.org/org/documents/edl-v10.php.
+
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
+Contributors:
+   Roger Light - initial implementation and documentation.
+*/
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/plugins/message-timestamp/mosquitto_message_timestamp.c b/plugins/message-timestamp/mosquitto_message_timestamp.c
index 56953164..86132f42 100644
--- a/plugins/message-timestamp/mosquitto_message_timestamp.c
+++ b/plugins/message-timestamp/mosquitto_message_timestamp.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/plugins/payload-modification/mosquitto_payload_modification.c b/plugins/payload-modification/mosquitto_payload_modification.c
index 3448dcfc..af4da408 100644
--- a/plugins/payload-modification/mosquitto_payload_modification.c
+++ b/plugins/payload-modification/mosquitto_payload_modification.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/bridge.c b/src/bridge.c
index cd14a9f0..4bdc8be6 100644
--- a/src/bridge.c
+++ b/src/bridge.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/bridge_topic.c b/src/bridge_topic.c
index b8d2a420..fd4bd133 100644
--- a/src/bridge_topic.c
+++ b/src/bridge_topic.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/conf.c b/src/conf.c
index f5b9046c..32735ea9 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/conf_includedir.c b/src/conf_includedir.c
index 15b5526c..42f47156 100644
--- a/src/conf_includedir.c
+++ b/src/conf_includedir.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/context.c b/src/context.c
index 715e59dc..9b1eb596 100644
--- a/src/context.c
+++ b/src/context.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/control.c b/src/control.c
index e2880786..d158a4ac 100644
--- a/src/control.c
+++ b/src/control.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/database.c b/src/database.c
index 2b8c5588..120e3a5d 100644
--- a/src/database.c
+++ b/src/database.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/handle_auth.c b/src/handle_auth.c
index 9f72d694..36c3091a 100644
--- a/src/handle_auth.c
+++ b/src/handle_auth.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/handle_connack.c b/src/handle_connack.c
index 14a4f2a3..8ee3bdf3 100644
--- a/src/handle_connack.c
+++ b/src/handle_connack.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/handle_connect.c b/src/handle_connect.c
index 207fd5a1..ad21c5b2 100644
--- a/src/handle_connect.c
+++ b/src/handle_connect.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/handle_disconnect.c b/src/handle_disconnect.c
index fdef4a7d..7c89f53a 100644
--- a/src/handle_disconnect.c
+++ b/src/handle_disconnect.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/handle_publish.c b/src/handle_publish.c
index 1fe3899f..4c4e3710 100644
--- a/src/handle_publish.c
+++ b/src/handle_publish.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/handle_subscribe.c b/src/handle_subscribe.c
index b38558ae..e6e90a7b 100644
--- a/src/handle_subscribe.c
+++ b/src/handle_subscribe.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/handle_unsubscribe.c b/src/handle_unsubscribe.c
index 9f77c6e7..e4930f2c 100644
--- a/src/handle_unsubscribe.c
+++ b/src/handle_unsubscribe.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/keepalive.c b/src/keepalive.c
index b86a6589..dcdf03b2 100644
--- a/src/keepalive.c
+++ b/src/keepalive.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/lib_load.h b/src/lib_load.h
index 8a25f41c..886662a8 100644
--- a/src/lib_load.h
+++ b/src/lib_load.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/logging.c b/src/logging.c
index 031dd644..df9d67f2 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/loop.c b/src/loop.c
index 6826f2bc..14663c87 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
    Tatsuzo Osawa - Add epoll.
diff --git a/src/memory_public.c b/src/memory_public.c
index e38d8284..c9032600 100644
--- a/src/memory_public.c
+++ b/src/memory_public.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/mosquitto.c b/src/mosquitto.c
index 85bfc7c3..c9248946 100644
--- a/src/mosquitto.c
+++ b/src/mosquitto.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h
index 101f7c0b..25e868e4 100644
--- a/src/mosquitto_broker_internal.h
+++ b/src/mosquitto_broker_internal.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
    Tatsuzo Osawa - Add epoll.
diff --git a/src/mux.c b/src/mux.c
index bf6bb3a2..74483201 100644
--- a/src/mux.c
+++ b/src/mux.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
    Tatsuzo Osawa - Add epoll.
diff --git a/src/mux.h b/src/mux.h
index dbe2ec3a..6b416c99 100644
--- a/src/mux.h
+++ b/src/mux.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/mux_epoll.c b/src/mux_epoll.c
index 1aeeaa29..23b23a16 100644
--- a/src/mux_epoll.c
+++ b/src/mux_epoll.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
    Tatsuzo Osawa - Add epoll.
diff --git a/src/mux_poll.c b/src/mux_poll.c
index 4d4413a6..48ccd794 100644
--- a/src/mux_poll.c
+++ b/src/mux_poll.c
@@ -10,9 +10,10 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
-   Tatsuzo Osawa - Add epoll.
 */
 
 #include "config.h"
diff --git a/src/net.c b/src/net.c
index 848b294d..76464f7c 100644
--- a/src/net.c
+++ b/src/net.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/password_mosq.c b/src/password_mosq.c
index 538a5613..73b81976 100644
--- a/src/password_mosq.c
+++ b/src/password_mosq.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/password_mosq.h b/src/password_mosq.h
index 6c897ff3..4c5b20f9 100644
--- a/src/password_mosq.h
+++ b/src/password_mosq.h
@@ -12,6 +12,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/persist.h b/src/persist.h
index 2550e4aa..80358aad 100644
--- a/src/persist.h
+++ b/src/persist.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/persist_read.c b/src/persist_read.c
index 1337912a..50a27e63 100644
--- a/src/persist_read.c
+++ b/src/persist_read.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/persist_read_v234.c b/src/persist_read_v234.c
index c56d7e3d..933da7df 100644
--- a/src/persist_read_v234.c
+++ b/src/persist_read_v234.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/persist_read_v5.c b/src/persist_read_v5.c
index 4f3e7074..f5e0cc57 100644
--- a/src/persist_read_v5.c
+++ b/src/persist_read_v5.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/persist_write.c b/src/persist_write.c
index d537c6ef..0f0e21c7 100644
--- a/src/persist_write.c
+++ b/src/persist_write.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/persist_write_v5.c b/src/persist_write_v5.c
index 944f20a3..75d99ade 100644
--- a/src/persist_write_v5.c
+++ b/src/persist_write_v5.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/plugin.c b/src/plugin.c
index cac37f90..899cf5db 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/plugin_debug.c b/src/plugin_debug.c
index 4e719c1d..16bdf3d5 100644
--- a/src/plugin_debug.c
+++ b/src/plugin_debug.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/plugin_defer.c b/src/plugin_defer.c
index 23eb0a27..1c6c7728 100644
--- a/src/plugin_defer.c
+++ b/src/plugin_defer.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/plugin_public.c b/src/plugin_public.c
index bac56596..97bda323 100644
--- a/src/plugin_public.c
+++ b/src/plugin_public.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/property_broker.c b/src/property_broker.c
index 5f78c7de..4dc8a82d 100644
--- a/src/property_broker.c
+++ b/src/property_broker.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/read_handle.c b/src/read_handle.c
index 95322560..dbebc1ce 100644
--- a/src/read_handle.c
+++ b/src/read_handle.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/retain.c b/src/retain.c
index b10e15f1..9842c777 100644
--- a/src/retain.c
+++ b/src/retain.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/security.c b/src/security.c
index d037e73d..002b27ea 100644
--- a/src/security.c
+++ b/src/security.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/security_default.c b/src/security_default.c
index f1dd9365..f228a16b 100644
--- a/src/security_default.c
+++ b/src/security_default.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/send_auth.c b/src/send_auth.c
index a05c9515..5a42de4f 100644
--- a/src/send_auth.c
+++ b/src/send_auth.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/send_connack.c b/src/send_connack.c
index e5948484..b4c8e29d 100644
--- a/src/send_connack.c
+++ b/src/send_connack.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/send_suback.c b/src/send_suback.c
index 1e304e02..3f4726bd 100644
--- a/src/send_suback.c
+++ b/src/send_suback.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/send_unsuback.c b/src/send_unsuback.c
index 43adf18c..8e6a3880 100644
--- a/src/send_unsuback.c
+++ b/src/send_unsuback.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/service.c b/src/service.c
index e1d7f886..2b032691 100644
--- a/src/service.c
+++ b/src/service.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/session_expiry.c b/src/session_expiry.c
index 163caed3..03aed565 100644
--- a/src/session_expiry.c
+++ b/src/session_expiry.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/signals.c b/src/signals.c
index 94cfada5..f7917c00 100644
--- a/src/signals.c
+++ b/src/signals.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
    Dmitry Kaukov - windows named events implementation.
diff --git a/src/subs.c b/src/subs.c
index 1105d8be..a129f53e 100644
--- a/src/subs.c
+++ b/src/subs.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/sys_tree.c b/src/sys_tree.c
index f365aed9..14eb71fb 100644
--- a/src/sys_tree.c
+++ b/src/sys_tree.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/sys_tree.h b/src/sys_tree.h
index 44957369..71adec50 100644
--- a/src/sys_tree.h
+++ b/src/sys_tree.h
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/topic_tok.c b/src/topic_tok.c
index c46a7403..4e16c446 100644
--- a/src/topic_tok.c
+++ b/src/topic_tok.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/websockets.c b/src/websockets.c
index ceba7c10..10e09295 100644
--- a/src/websockets.c
+++ b/src/websockets.c
@@ -1,30 +1,19 @@
 /*
-Copyright (c) 2014-2020 Roger Light <roger@atchoo.org>
-All rights reserved.
+Copyright (c) 2014-2019 Roger Light <roger@atchoo.org>
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License 2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
 
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of mosquitto nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
+The Eclipse Public License is available at
+   https://www.eclipse.org/legal/epl-2.0/
+and the Eclipse Distribution License is available at
+  http://www.eclipse.org/org/documents/edl-v10.php.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
+Contributors:
+   Roger Light - initial implementation and documentation.
 */
 
 #ifdef WITH_WEBSOCKETS
diff --git a/src/will_delay.c b/src/will_delay.c
index 3969d8db..2fc6eb54 100644
--- a/src/will_delay.c
+++ b/src/will_delay.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
  
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */
diff --git a/src/xtreport.c b/src/xtreport.c
index 9622286b..a3f99511 100644
--- a/src/xtreport.c
+++ b/src/xtreport.c
@@ -10,6 +10,8 @@ The Eclipse Public License is available at
 and the Eclipse Distribution License is available at
   http://www.eclipse.org/org/documents/edl-v10.php.
 
+SPDX-License-Identifier: EPL-2.0 OR EDL-1.0
+
 Contributors:
    Roger Light - initial implementation and documentation.
 */