diff --git a/tipc/bearer.c b/tipc/bearer.c
index 968293bc9160..bb434f5f74bc 100644
--- a/tipc/bearer.c
+++ b/tipc/bearer.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * bearer.c	TIPC bearer functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/bearer.h b/tipc/bearer.h
index c0d099630b27..a93446592b26 100644
--- a/tipc/bearer.h
+++ b/tipc/bearer.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * bearer.h	TIPC bearer functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/cmdl.c b/tipc/cmdl.c
index feaac2da175f..152ddb517ebb 100644
--- a/tipc/cmdl.c
+++ b/tipc/cmdl.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * cmdl.c	Framework for handling command line options.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/cmdl.h b/tipc/cmdl.h
index dcade362e692..18fe51bf24a7 100644
--- a/tipc/cmdl.h
+++ b/tipc/cmdl.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * cmdl.h	Framework for handling command line options.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/link.c b/tipc/link.c
index 53f49c8937db..f91c300016f2 100644
--- a/tipc/link.c
+++ b/tipc/link.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * link.c	TIPC link functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/link.h b/tipc/link.h
index 6dc95e5b69b9..a0d4603580c5 100644
--- a/tipc/link.h
+++ b/tipc/link.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * link.c	TIPC link functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/media.c b/tipc/media.c
index a3fec681cbf4..5ff0c8c489f1 100644
--- a/tipc/media.c
+++ b/tipc/media.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * media.c	TIPC link functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/media.h b/tipc/media.h
index 8584af74b72e..f1b4b54055a2 100644
--- a/tipc/media.h
+++ b/tipc/media.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * media.h	TIPC link functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/misc.c b/tipc/misc.c
index 6175bf07d07c..32d4a5e0b1d1 100644
--- a/tipc/misc.c
+++ b/tipc/misc.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * misc.c	Miscellaneous TIPC helper functions.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/misc.h b/tipc/misc.h
index 59309f68f201..d00d7c9caa2b 100644
--- a/tipc/misc.h
+++ b/tipc/misc.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * misc.h	Miscellaneous TIPC helper functions.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/msg.c b/tipc/msg.c
index 1225691c9a81..731b0fa76784 100644
--- a/tipc/msg.c
+++ b/tipc/msg.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * msg.c	Messaging (netlink) helper functions.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/msg.h b/tipc/msg.h
index 56af5a705fb9..118a26647559 100644
--- a/tipc/msg.h
+++ b/tipc/msg.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * msg.h	Messaging (netlink) helper functions.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/nametable.c b/tipc/nametable.c
index b09ed5fc7280..5162f7fcf479 100644
--- a/tipc/nametable.c
+++ b/tipc/nametable.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * nametable.c	TIPC nametable functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/nametable.h b/tipc/nametable.h
index e0473e18e75b..c4df8d9d209a 100644
--- a/tipc/nametable.h
+++ b/tipc/nametable.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * nametable.h	TIPC nametable functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/node.c b/tipc/node.c
index bf592a074635..e645d374cd82 100644
--- a/tipc/node.c
+++ b/tipc/node.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * node.c	TIPC node functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/node.h b/tipc/node.h
index afee1fd06039..4a986d078bfb 100644
--- a/tipc/node.h
+++ b/tipc/node.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * node.h	TIPC node functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/peer.c b/tipc/peer.c
index ed18efc552fa..5a583fb9185e 100644
--- a/tipc/peer.c
+++ b/tipc/peer.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * peer.c	TIPC peer functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/peer.h b/tipc/peer.h
index 89722616529e..2bd0a2a37b15 100644
--- a/tipc/peer.h
+++ b/tipc/peer.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * peer.h	TIPC peer functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/socket.c b/tipc/socket.c
index 597ffd91af52..4d376e075885 100644
--- a/tipc/socket.c
+++ b/tipc/socket.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * socket.c	TIPC socket functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/socket.h b/tipc/socket.h
index 9d1b64872f53..c4341bb213d6 100644
--- a/tipc/socket.h
+++ b/tipc/socket.h
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * socket.h	TIPC socket functionality.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
diff --git a/tipc/tipc.c b/tipc/tipc.c
index 9f23a4bfd25d..56af052cbbcd 100644
--- a/tipc/tipc.c
+++ b/tipc/tipc.c
@@ -1,11 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * tipc.	TIPC utility frontend.
  *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
  * Authors:	Richard Alpe <richard.alpe@ericsson.com>
  */
 
