diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog
index 6c3ff8f4913b83f9ad7c4ffae875ea712077718e..8e0f4dd10b65fdfbff3096197ddc8d9e1de09f79 100644
--- a/smartmontools/ChangeLog
+++ b/smartmontools/ChangeLog
@@ -2,6 +2,9 @@ $Id$
 
 2018-08-19  Christian Franke  <franke@computer.org>
 
+	Add SPDX-License-Identifier to all files with GPL header (#919).
+	Remove GPL headers.  Remove outdated info about smartsuite.
+
 	getopt/*, regex/*: Replace with current version from glibc 2.28
 	(2018-08-01).  Add _GETOPT/REGEX*_STANDALONE configurations.
 	Makefile.am, os_win32/vc14/smart*.vcxproj*: Set *_STANDALONE.
diff --git a/smartmontools/README b/smartmontools/README
index 10239b7dd7dd28450ccd4612633244458fe75fd9..583e1d0308f12cf2ea076860939b1468aef18a3c 100644
--- a/smartmontools/README
+++ b/smartmontools/README
@@ -20,7 +20,7 @@ You will find a mailing list for support and other questions at:
 
 == COPYING ==
 Copyright (C) 2002-9 Bruce Allen
-Copyright (C) 2004-15 Christian Franke
+Copyright (C) 2004-18 Christian Franke
 
 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
@@ -30,6 +30,8 @@ version.
 You should have received a copy of the GNU General Public License (for
 example COPYING).  If not, see <http://www.gnu.org/licenses/>.
 
+SPDX-License-Identifier: GPL-2.0-or-later
+
 
 == CREDITS ==
 See AUTHORS file.
diff --git a/smartmontools/aacraid.h b/smartmontools/aacraid.h
index d62fbca0ca35dad41e56857b518144e1e95e3428..5bc4d63a636ecf7810d0a3b777ecefdaaa332927 100644
--- a/smartmontools/aacraid.h
+++ b/smartmontools/aacraid.h
@@ -2,14 +2,7 @@
  * Copyright (C) 2014 Raghava Aditya <Raghava.Aditya@pmcs.com>
  * Copyright (C) 2015 Nidhi Malhotra <Nidhi.Malhotra@pmcs.com>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 // Check windows
diff --git a/smartmontools/atacmdnames.cpp b/smartmontools/atacmdnames.cpp
index d503a150f12bbd86408f8f0de1bb231dbbef5c50..073fb22f17a9a33e269245941bb9b50fd5115fa6 100644
--- a/smartmontools/atacmdnames.cpp
+++ b/smartmontools/atacmdnames.cpp
@@ -6,14 +6,7 @@
  * Copyright (C) 2003-8 Philip Williams
  * Copyright (C) 2012 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "atacmdnames.h"
diff --git a/smartmontools/atacmdnames.h b/smartmontools/atacmdnames.h
index 8c2eb0faa37f2724ac1f6ecbd834b61f57da37d7..f3f4d4ce107f03bb67cecb9e8cead361da2a514a 100644
--- a/smartmontools/atacmdnames.h
+++ b/smartmontools/atacmdnames.h
@@ -8,15 +8,7 @@
  *
  * Copyright (C) 2003-8 Philip Williams
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef ATACMDNAMES_H_
diff --git a/smartmontools/atacmds.cpp b/smartmontools/atacmds.cpp
index b85fb309c57c96b6765578962be13eee394f3ccc..ae677074fa05cb83774fbd5370f61ada3d56c977 100644
--- a/smartmontools/atacmds.cpp
+++ b/smartmontools/atacmds.cpp
@@ -8,19 +8,7 @@
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  * Copyright (C) 2000 Andre Hedrick <andre@linux-ide.org>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- * 
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/atacmds.h b/smartmontools/atacmds.h
index 7b217638fdc2651d52c04a9c1ba87d57bef99561..e71c964655f7cbbce2a0026a31de847e31807d46 100644
--- a/smartmontools/atacmds.h
+++ b/smartmontools/atacmds.h
@@ -7,19 +7,7 @@
  * Copyright (C) 2008-17 Christian Franke
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef ATACMDS_H_
diff --git a/smartmontools/ataidentify.cpp b/smartmontools/ataidentify.cpp
index bd94a89c6626b2d31b24ad71418fc28eec5798b1..ff7c7a938bad2ca40d3977a2f87c575763381424 100644
--- a/smartmontools/ataidentify.cpp
+++ b/smartmontools/ataidentify.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2012-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/ataidentify.h b/smartmontools/ataidentify.h
index 6f65f1971613f3dafdd483e237ff0d7bec0f7197..cbdac661ff02d9655b404403870a77887e0c9af9 100644
--- a/smartmontools/ataidentify.h
+++ b/smartmontools/ataidentify.h
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2012 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef ATAIDENTIFY_H
diff --git a/smartmontools/ataprint.cpp b/smartmontools/ataprint.cpp
index d92bb6f2c21dc1a034b59b1d7ad3325367be42cd..cd891cc3b09d6790fc756e00de7c861ab41f5204 100644
--- a/smartmontools/ataprint.cpp
+++ b/smartmontools/ataprint.cpp
@@ -7,19 +7,7 @@
  * Copyright (C) 2008-18 Christian Franke
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/ataprint.h b/smartmontools/ataprint.h
index baf56eeb15d24ca104c0a3b906ed36fe3fd0b2e8..a1a367d9a661a5cd90fd0a9e902256ffa12ee552 100644
--- a/smartmontools/ataprint.h
+++ b/smartmontools/ataprint.h
@@ -7,19 +7,7 @@
  * Copyright (C) 2008-17 Christian Franke
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef ATAPRINT_H_
diff --git a/smartmontools/dev_areca.cpp b/smartmontools/dev_areca.cpp
index aa5fbdc39288490eb59d64ec8fd7db22381b5a52..07c401637a0d885f1f8f087ddd81f3c54eeff231 100644
--- a/smartmontools/dev_areca.cpp
+++ b/smartmontools/dev_areca.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2012 Hank Wu <hank@areca.com.tw>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/dev_areca.h b/smartmontools/dev_areca.h
index 0047b2a896852ef1850f3f66d7ce7dc55803f470..53f832201175f3c05e7e2f246da6166727bebfac 100644
--- a/smartmontools/dev_areca.h
+++ b/smartmontools/dev_areca.h
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2012 Hank Wu <hank@areca.com.tw>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef DEV_ARECA_H
diff --git a/smartmontools/dev_ata_cmd_set.cpp b/smartmontools/dev_ata_cmd_set.cpp
index f92e4db3d7dbf9cb2476a8b7c71644a79360ab66..ce6bfec012194e2edbdc769d20071254caa9063e 100644
--- a/smartmontools/dev_ata_cmd_set.cpp
+++ b/smartmontools/dev_ata_cmd_set.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2008-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/dev_ata_cmd_set.h b/smartmontools/dev_ata_cmd_set.h
index e4aa4185c1222ce9533ba93da169ac6e8a95146c..02641d91096df2cd70937dde5ad2eeaf986fadf9 100644
--- a/smartmontools/dev_ata_cmd_set.h
+++ b/smartmontools/dev_ata_cmd_set.h
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2008 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef DEV_ATA_CMD_SET_H
diff --git a/smartmontools/dev_intelliprop.cpp b/smartmontools/dev_intelliprop.cpp
index aaf83315c7cb501e7b80226568ce9ee1cd607a6c..02738a7f0374bab4a6318337cc1007d0c58461b2 100644
--- a/smartmontools/dev_intelliprop.cpp
+++ b/smartmontools/dev_intelliprop.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2016 Casey Biemiller  <cbiemiller@intelliprop.com>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/dev_intelliprop.h b/smartmontools/dev_intelliprop.h
index db299837de36283e41a9ad0fd966d3d6b7dbc149..5ce734d12c7a02c162d7229ecd58c5645ad9d708 100644
--- a/smartmontools/dev_intelliprop.h
+++ b/smartmontools/dev_intelliprop.h
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2012 Hank Wu <hank@areca.com.tw>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef DEV_INTELLIPROP_H
diff --git a/smartmontools/dev_interface.cpp b/smartmontools/dev_interface.cpp
index 1224ffb5e29ae59bd1d375838989eb10f2c8e2c0..2cfe22c16d7be96543b8d474822c316f2140ba4e 100644
--- a/smartmontools/dev_interface.cpp
+++ b/smartmontools/dev_interface.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2008-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/dev_interface.h b/smartmontools/dev_interface.h
index 7bc4b8891e9945752df374ffd30ab92f8f89faff..23e2af6ba4b50a1a4ae3882da0ded34cfb9419d4 100644
--- a/smartmontools/dev_interface.h
+++ b/smartmontools/dev_interface.h
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2008-16 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef DEV_INTERFACE_H
diff --git a/smartmontools/dev_legacy.cpp b/smartmontools/dev_legacy.cpp
index 9dc418c15a4ca2a2df3b28bd026b64abd2373ede..21672e22f9edc9920db070c031811ffb2e6a9cd2 100644
--- a/smartmontools/dev_legacy.cpp
+++ b/smartmontools/dev_legacy.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2008-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/dev_tunnelled.h b/smartmontools/dev_tunnelled.h
index 53e527d206221819f16bf83bad5e552ee869c10a..a89a333c07d3d66e64ab047a55491dc644768156 100644
--- a/smartmontools/dev_tunnelled.h
+++ b/smartmontools/dev_tunnelled.h
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2008 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef DEV_TUNNELLED_H
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 636e6c09c6d1657733e3c913769db919e564cd52..59dda1798b518d22cf0b9f456fc3dbbbab4f4c29 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -6,14 +6,7 @@
  * Copyright (C) 2003-11 Philip Williams, Bruce Allen
  * Copyright (C) 2008-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
diff --git a/smartmontools/examplescripts/README b/smartmontools/examplescripts/README
index 01f8960c5a5333677e8d9288a2c648e9998afeac..0dc134da6f3907e9868cc0dfe4dc515ebe9be374 100644
--- a/smartmontools/examplescripts/README
+++ b/smartmontools/examplescripts/README
@@ -5,18 +5,8 @@
 # Copyright (C) 2003-08 Bruce Allen
 # Copyright (C) 2009-18 Christian Franke
 # 
-# 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, or (at your option) any later
-# version.
-# 
-# You should have received a copy of the GNU General Public License (for
-# example COPYING).  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
-# This code was originally developed as a Senior Thesis by Michael Cornwell
-# at the Concurrent Systems Laboratory (now part of the Storage Systems
-# Research Center), Jack Baskin School of Engineering, University of
-# California, Santa Cruz. http://ssrc.soe.ucsc.edu/
 
 This directory contains executable shell scripts, that are intended for
 use with the
diff --git a/smartmontools/json.cpp b/smartmontools/json.cpp
index 0f1d9cb4202eb74ca6425e11d718d26d048d835a..0143802689a1b731f2390a37dd644a07322a1226 100644
--- a/smartmontools/json.cpp
+++ b/smartmontools/json.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2017-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/json.h b/smartmontools/json.h
index cff82df95795910988ed56fc756a0aae18e5d92a..ea4f17082e5a9e991a7f3a27bf3960fe67896429 100644
--- a/smartmontools/json.h
+++ b/smartmontools/json.h
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2017-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef JSON_H_CVSID
diff --git a/smartmontools/knowndrives.cpp b/smartmontools/knowndrives.cpp
index 7eaa7fc1346232ad0df66081a4eadd0d3e352677..9cee006ef11745418991e5aa20d444f2636f386b 100644
--- a/smartmontools/knowndrives.cpp
+++ b/smartmontools/knowndrives.cpp
@@ -6,14 +6,7 @@
  * Copyright (C) 2003-11 Philip Williams, Bruce Allen
  * Copyright (C) 2008-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/knowndrives.h b/smartmontools/knowndrives.h
index ecd30d05636451a56fdbe51f523dae07a8182fc2..a1c461cef4958eae72b570225275a022e81583d7 100644
--- a/smartmontools/knowndrives.h
+++ b/smartmontools/knowndrives.h
@@ -6,14 +6,7 @@
  * Copyright (C) 2003-11 Philip Williams, Bruce Allen
  * Copyright (C) 2008-15 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef KNOWNDRIVES_H_
diff --git a/smartmontools/nvmecmds.cpp b/smartmontools/nvmecmds.cpp
index 6a7b050c82ec287e8e9e23b4dc49d4591716d1ae..57742257994579f5e4d05407a153405f1df791cb 100644
--- a/smartmontools/nvmecmds.cpp
+++ b/smartmontools/nvmecmds.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2016 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/nvmecmds.h b/smartmontools/nvmecmds.h
index a8dd4172d6370d6320e5620c8f5ee32e060cd03b..350df51fd86f8f7fb80843ebc95138510555c27e 100644
--- a/smartmontools/nvmecmds.h
+++ b/smartmontools/nvmecmds.h
@@ -8,14 +8,7 @@
  * Original code from <linux/nvme.h>:
  *   Copyright (C) 2011-2014 Intel Corporation
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef NVMECMDS_H
@@ -33,19 +26,6 @@ namespace smartmontools {
 
 ////////////////////////////////////////////////////////////////////////////
 // BEGIN: From <linux/nvme.h>
-/*
- * Definitions for the NVM Express interface
- * Copyright (c) 2011-2014, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
 
 struct nvme_error_log_page {
   uint64_t        error_count;
diff --git a/smartmontools/nvmeprint.cpp b/smartmontools/nvmeprint.cpp
index 9b65f479ed35be2c0127ef538c9a180a2a91f20b..65da8103eb83a42e1c79b71a1490ea1701dd2176 100644
--- a/smartmontools/nvmeprint.cpp
+++ b/smartmontools/nvmeprint.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2016-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/nvmeprint.h b/smartmontools/nvmeprint.h
index d9275bf8a5b58131f4843f51f03fa392bf5e509f..b08857f4eca18867f5a58c07e0f6a3dca313b43a 100644
--- a/smartmontools/nvmeprint.h
+++ b/smartmontools/nvmeprint.h
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2016 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef NVMEPRINT_H
diff --git a/smartmontools/os_darwin.cpp b/smartmontools/os_darwin.cpp
index 71b690415ba60c3c30d8ed0c5b30fc93955c531e..c405a94f1480cdfd0cb83710cc39094675ff6b40 100644
--- a/smartmontools/os_darwin.cpp
+++ b/smartmontools/os_darwin.cpp
@@ -6,14 +6,7 @@
  * Copyright (C) 2004-8 Geoffrey Keating <geoffk@geoffk.org>
  * Copyright (C) 2014 Alex Samorukov <samm@os2.kiev.ua>
  *
- * 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, or (at your option)
- * any later version.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with smartmontools.  If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <stdbool.h>
diff --git a/smartmontools/os_darwin.h b/smartmontools/os_darwin.h
index 15d898a7a597eaadcaa6f194cd33be7f1032a9ce..e07f38b11bddd93546608686dbc2f46cadd0e2c4 100644
--- a/smartmontools/os_darwin.h
+++ b/smartmontools/os_darwin.h
@@ -5,20 +5,7 @@
  *
  * Copyright (C) 2004-8 Geoff Keating <geoffk@geoffk.org>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef OS_DARWIN_H_
diff --git a/smartmontools/os_freebsd.cpp b/smartmontools/os_freebsd.cpp
index 4582971e80969aa17fccfdd9ecc268e9f634df15..f05c2ba124e918450365d1ac27f15b1c6893d0a7 100644
--- a/smartmontools/os_freebsd.cpp
+++ b/smartmontools/os_freebsd.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2003-10 Eduard Martinescu
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <sys/param.h>
diff --git a/smartmontools/os_freebsd.h b/smartmontools/os_freebsd.h
index 16fabff1f29b9c8adab5bca69446c8ba1c19d00f..aa727dd285335e3b5fccc3641e9b3b550bf0e3cb 100644
--- a/smartmontools/os_freebsd.h
+++ b/smartmontools/os_freebsd.h
@@ -5,20 +5,7 @@
  *
  * Copyright (C) 2003-8 Eduard Martinescu
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*-
diff --git a/smartmontools/os_generic.cpp b/smartmontools/os_generic.cpp
index 805e3898d21f05ca82c061dabe4eb67c71b2a1a6..e63da634e75693e44360329c06f8d0325c6d8d74 100644
--- a/smartmontools/os_generic.cpp
+++ b/smartmontools/os_generic.cpp
@@ -7,14 +7,7 @@
  * Copyright (C) 2003-8 Bruce Allen
  * Copyright (C) 2008-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
diff --git a/smartmontools/os_generic.h b/smartmontools/os_generic.h
index faaf835a080283b43a68062800f10c6c1fda3ac5..71929ea210302a3b86516a83f37f078ab85622ab 100644
--- a/smartmontools/os_generic.h
+++ b/smartmontools/os_generic.h
@@ -6,20 +6,7 @@
  * Copyright (C) YEAR YOUR_NAME
  * Copyright (C) 2003-8 Bruce Allen
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 // In the three following lines, change 'GENERIC' to your OS name
diff --git a/smartmontools/os_linux.cpp b/smartmontools/os_linux.cpp
index 219351efb23a720f2d66e9b10d44320fc15795be..042651f77b443faff6a0b7bbeeea11bb383d4967 100644
--- a/smartmontools/os_linux.cpp
+++ b/smartmontools/os_linux.cpp
@@ -34,19 +34,7 @@
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  * Copyright (C) 2000 Andre Hedrick <andre@linux-ide.org>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 // This file contains the linux-specific IOCTL parts of
diff --git a/smartmontools/os_linux.h b/smartmontools/os_linux.h
index edc6953035c0e9552812d83e0dee1e24ed614fe3..fe7f7ae737cebf660edbf394bdd953c3e1a613d9 100644
--- a/smartmontools/os_linux.h
+++ b/smartmontools/os_linux.h
@@ -17,21 +17,7 @@
  *  Kernel compatablity By:     Andre Hedrick <andre@suse.com>
  *  Non-Copyright (C) 2000      Andre Hedrick <andre@suse.com>
  *
- *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- * 
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
diff --git a/smartmontools/os_netbsd.cpp b/smartmontools/os_netbsd.cpp
index 65ff23cb962c815c2ffd52533fa37d97ba321f67..addc7155e3ec2d1f706bee51962208dbdb8ddcda 100644
--- a/smartmontools/os_netbsd.cpp
+++ b/smartmontools/os_netbsd.cpp
@@ -6,15 +6,7 @@
  * Copyright (C) 2003-8 Sergey Svishchev
  * Copyright (C) 2016 Kimihiro Nonaka
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/os_netbsd.h b/smartmontools/os_netbsd.h
index 232100da5a0e680ef19b96e23291a70bbad27913..01324b9314fafe6f2c680a6c15630aa55fd6b5a1 100644
--- a/smartmontools/os_netbsd.h
+++ b/smartmontools/os_netbsd.h
@@ -5,20 +5,7 @@
  *
  * Copyright (C) 2003-8 Sergey Svishchev
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef OS_NETBSD_H_
diff --git a/smartmontools/os_openbsd.cpp b/smartmontools/os_openbsd.cpp
index 97ee2a41031b515b5cae582c236c8bd5488790bf..1c816ef2748ba98efb3b6097f8c02991abe54a69 100644
--- a/smartmontools/os_openbsd.cpp
+++ b/smartmontools/os_openbsd.cpp
@@ -7,15 +7,7 @@
  *
  * Derived from os_netbsd.cpp by Sergey Svishchev, Copyright (C) 2003-8
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/os_openbsd.h b/smartmontools/os_openbsd.h
index 099eea319c9abcde66fa17337df125aa24e9892c..b7bcf107e69b50cd27f77dea41776f01a6099440 100644
--- a/smartmontools/os_openbsd.h
+++ b/smartmontools/os_openbsd.h
@@ -7,20 +7,7 @@
  *
  * Derived from os_netbsd.c by Sergey Svishchev, Copyright (C) 2003-8
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef OS_OPENBSD_H_
diff --git a/smartmontools/os_os2.cpp b/smartmontools/os_os2.cpp
index 858926563852cc5bd73359ee8316e4ace2e5eacb..6a403b8e0b52820ada693d80a2b7e0c39f9ece85 100644
--- a/smartmontools/os_os2.cpp
+++ b/smartmontools/os_os2.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2004-8 Yuri Dario
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
diff --git a/smartmontools/os_os2.h b/smartmontools/os_os2.h
index 8d009ba42586b7315b5b51771c00125f9e212851..6ef7f7a67993b9f2319a5a4f5f4c4f14e316ebdc 100644
--- a/smartmontools/os_os2.h
+++ b/smartmontools/os_os2.h
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2004-8 Yuri Dario
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef OS_OS2_H_
diff --git a/smartmontools/os_qnxnto.h b/smartmontools/os_qnxnto.h
index f499fef53ddf4fe852759b1f7bf3f0be74001568..f916816f8afad2be9b1f5ed2d2c392d167e4875e 100644
--- a/smartmontools/os_qnxnto.h
+++ b/smartmontools/os_qnxnto.h
@@ -6,20 +6,7 @@
  * Copyright (C) Joerg Hering
  * Copyright (C) 2003-8 Bruce Allen
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 #ifndef OS_QNXNTO_H_
 #define OS_QNXNTO_H_
diff --git a/smartmontools/os_solaris.cpp b/smartmontools/os_solaris.cpp
index c85d0f0252609e84ed3d9ed722881af4fa810dc2..30ae8f67957b81d16c5d22b87be0310aa2157e6f 100644
--- a/smartmontools/os_solaris.cpp
+++ b/smartmontools/os_solaris.cpp
@@ -6,15 +6,7 @@
  * Copyright (C) 2003-08 SAWADA Keiji
  * Copyright (C) 2003-15 Casper Dik
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <stdlib.h>
diff --git a/smartmontools/os_solaris.h b/smartmontools/os_solaris.h
index 9f8e9ee191dd659d9a4600af60d61a1ee69d7fc1..4afc179ca53b8b533fe2134468ab14102b477582 100644
--- a/smartmontools/os_solaris.h
+++ b/smartmontools/os_solaris.h
@@ -6,20 +6,7 @@
  * Copyright (C) 2003-8 SAWADA Keiji
  * Copyright (C) 2003-8 Casper Dik
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef OS_SOLARIS_H_
diff --git a/smartmontools/os_solaris_ata.s b/smartmontools/os_solaris_ata.s
index b384473ccb357b2f650102a12f6ea25192e2947a..f5d3f0fb94ae5d099b93c0f75e06516707c39200 100644
--- a/smartmontools/os_solaris_ata.s
+++ b/smartmontools/os_solaris_ata.s
@@ -5,19 +5,7 @@
 ! 
 !   Copyright (C) 2003-8 SAWADA Keiji
 ! 
-!   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.
-! 
-!   This program is distributed in the hope that it will be useful, but
-!   WITHOUT ANY WARRANTY; without even the implied warranty of
-!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-!   General Public License for more details.
-! 
-!   You should have received a copy of the GNU General Public License
-!   along with this program; if not, write to the Free Software Foundation,
-!   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+!   SPDX-License-Identifier: GPL-2.0-or-later
 ! 
 ! 
 !        --------------------------------------------------------
diff --git a/smartmontools/os_win32.cpp b/smartmontools/os_win32.cpp
index 64fb831a074af196ff5a721201668e4a28ee6efa..449cecb1f38ae7555e3ea579691aba8f7e138e41 100644
--- a/smartmontools/os_win32.cpp
+++ b/smartmontools/os_win32.cpp
@@ -11,14 +11,7 @@
  * Original Areca code:
  *  Copyright (C) 2012    Hank Wu <hank@areca.com.tw>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/os_win32/daemon_win32.cpp b/smartmontools/os_win32/daemon_win32.cpp
index 4da41d97e23330b77eaa60a098e0b81be8646ab0..94cc5b05c5d092d1325116ca30cf22d6be4ae3fe 100644
--- a/smartmontools/os_win32/daemon_win32.cpp
+++ b/smartmontools/os_win32/daemon_win32.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2004-14 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #define WINVER 0x0600
diff --git a/smartmontools/os_win32/daemon_win32.h b/smartmontools/os_win32/daemon_win32.h
index 24e8e79e7dab9f323ec782c79f8840cb08c174f9..7cbc42ccc1e5429edb9c8038c05537f02feb6f4e 100644
--- a/smartmontools/os_win32/daemon_win32.h
+++ b/smartmontools/os_win32/daemon_win32.h
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2004-12 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef DAEMON_WIN32_H
diff --git a/smartmontools/os_win32/installer.nsi b/smartmontools/os_win32/installer.nsi
index 532e57089c7a344a187900ee68db9774a5192915..bffc51e3e7a9a3df2e911c2b0bb8143a256cc4c4 100644
--- a/smartmontools/os_win32/installer.nsi
+++ b/smartmontools/os_win32/installer.nsi
@@ -5,13 +5,7 @@
 ;
 ; Copyright (C) 2006-17 Christian Franke
 ;
-; 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, or (at your option)
-; any later version.
-;
-; You should have received a copy of the GNU General Public License
-; (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
+; SPDX-License-Identifier: GPL-2.0-or-later
 ;
 ; $Id$
 ;
diff --git a/smartmontools/os_win32/runcmd.c b/smartmontools/os_win32/runcmd.c
index d3e4205958310580ecc9c09073b68cee95adb1c1..8c68f02460c14e966614ce2372e38dccf9d260b1 100644
--- a/smartmontools/os_win32/runcmd.c
+++ b/smartmontools/os_win32/runcmd.c
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2011 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 char svnid[] = "$Id$";
diff --git a/smartmontools/os_win32/smartd_mailer.ps1 b/smartmontools/os_win32/smartd_mailer.ps1
index 1ef126298e59ae1e581e281ca536598a3ece8b2e..c08d99668f54e974c68b5b804f19ab13429c844a 100644
--- a/smartmontools/os_win32/smartd_mailer.ps1
+++ b/smartmontools/os_win32/smartd_mailer.ps1
@@ -5,13 +5,7 @@
 #
 # Copyright (C) 2016 Christian Franke
 #
-# 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, or (at your option)
-# any later version.
-#
-# You should have received a copy of the GNU General Public License
-# (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # $Id$
 #
diff --git a/smartmontools/os_win32/smartd_warning.cmd b/smartmontools/os_win32/smartd_warning.cmd
index b1bb4a1ee114b92b4a49a3a305bb8e840415c63f..91d2694a5cdc528506abf54931f83a7a571930e4 100644
--- a/smartmontools/os_win32/smartd_warning.cmd
+++ b/smartmontools/os_win32/smartd_warning.cmd
@@ -6,13 +6,7 @@
 ::
 :: Copyright (C) 2012-17 Christian Franke
 ::
-:: 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, or (at your option)
-:: any later version.
-::
-:: You should have received a copy of the GNU General Public License
-:: (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
+:: SPDX-License-Identifier: GPL-2.0-or-later
 ::
 :: $Id$
 ::
diff --git a/smartmontools/os_win32/syslog.h b/smartmontools/os_win32/syslog.h
index 30cd79daf70f9c9bfe262df91addfffd9e38a10d..425ecb59d92cf25fc23414d28d1b2cf68990c9ce 100644
--- a/smartmontools/os_win32/syslog.h
+++ b/smartmontools/os_win32/syslog.h
@@ -5,15 +5,7 @@
  *
  * Copyright (C) 2004-8 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef SYSLOG_H
diff --git a/smartmontools/os_win32/syslog_win32.cpp b/smartmontools/os_win32/syslog_win32.cpp
index 38530fb88a2d82c3eff2a321f87c593fbf7f6053..f78c91590a2ce6293d2e0276c01370b2bd6f3ec4 100644
--- a/smartmontools/os_win32/syslog_win32.cpp
+++ b/smartmontools/os_win32/syslog_win32.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2004-15 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 // Win32 Emulation of syslog() for smartd
diff --git a/smartmontools/os_win32/syslogevt.mc b/smartmontools/os_win32/syslogevt.mc
index 11fca796f127fb6866ffbbad92ebb51f98488748..8448b3e0ce457196bf326c262306591bee0ed085 100644
--- a/smartmontools/os_win32/syslogevt.mc
+++ b/smartmontools/os_win32/syslogevt.mc
@@ -5,15 +5,7 @@
 ; *
 ; * Copyright (C) 2004-10 Christian Franke
 ; *
-; * 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, or (at your option)
-; * any later version.
-; *
-; * You should have received a copy of the GNU General Public License
-; * (for example COPYING); if not, write to the Free Software Foundation,
-; * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-; *
+; * SPDX-License-Identifier: GPL-2.0-or-later
 ; */
 ;
 ;// $Id$
diff --git a/smartmontools/os_win32/update-smart-drivedb.nsi b/smartmontools/os_win32/update-smart-drivedb.nsi
index 3ab73d630667fdf0c0fdc40e6b2376d6e2dbda2e..b209ee882c905ce1d1549f0c4dfa5bdd2cb87e4c 100644
--- a/smartmontools/os_win32/update-smart-drivedb.nsi
+++ b/smartmontools/os_win32/update-smart-drivedb.nsi
@@ -5,13 +5,7 @@
 ;
 ; Copyright (C) 2011-13 Christian Franke
 ;
-; 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, or (at your option)
-; any later version.
-;
-; You should have received a copy of the GNU General Public License
-; (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
+; SPDX-License-Identifier: GPL-2.0-or-later
 ;
 ; $Id$
 ;
diff --git a/smartmontools/os_win32/wmiquery.cpp b/smartmontools/os_win32/wmiquery.cpp
index bac6d91fa0394bcfd091d376653391bc9a55a226..6f3fa035c37561ce814e1ad53be11248758fb6fb 100644
--- a/smartmontools/os_win32/wmiquery.cpp
+++ b/smartmontools/os_win32/wmiquery.cpp
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2011-13 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/os_win32/wmiquery.h b/smartmontools/os_win32/wmiquery.h
index 47438ea55ffb9ed02959b3791aa6dc1c81cffd7c..07e5d6cb9c7e203a2db6399269563b11b2565ccb 100644
--- a/smartmontools/os_win32/wmiquery.h
+++ b/smartmontools/os_win32/wmiquery.h
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2011-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef WMIQUERY_H
diff --git a/smartmontools/os_win32/wtssendmsg.c b/smartmontools/os_win32/wtssendmsg.c
index 901eb4973529fa00eaf29b5dba2e914297e45bef..d5f3d66cdea1bbc89a51178305028b870bd22cb5 100644
--- a/smartmontools/os_win32/wtssendmsg.c
+++ b/smartmontools/os_win32/wtssendmsg.c
@@ -5,14 +5,7 @@
  *
  * Copyright (C) 2012 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #define WINVER 0x0500
diff --git a/smartmontools/scsiata.cpp b/smartmontools/scsiata.cpp
index f4afda90c78eccfb2305d8f8e3c548432e9183f4..0f84a84d2bdd57a4de7d0bda379f319366b78669 100644
--- a/smartmontools/scsiata.cpp
+++ b/smartmontools/scsiata.cpp
@@ -6,15 +6,7 @@
  * Copyright (C) 2006-15 Douglas Gilbert <dgilbert@interlog.com>
  * Copyright (C) 2009-18 Christian Franke
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  * The code in this file is based on the SCSI to ATA Translation (SAT)
  * draft found at http://www.t10.org . The original draft used for this
  * code is sat-r08.pdf which is not too far away from becoming a
diff --git a/smartmontools/scsicmds.cpp b/smartmontools/scsicmds.cpp
index c0a097d2f4370ac3259dba71d3eb2f86944fc37b..66052a9e2838ac40aa538a4dc325b18bc0a0ae76 100644
--- a/smartmontools/scsicmds.cpp
+++ b/smartmontools/scsicmds.cpp
@@ -7,18 +7,7 @@
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  * Copyright (C) 2003-18 Douglas Gilbert <dgilbert@interlog.com>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  *
  * In the SCSI world "SMART" is a dead or withdrawn standard. In recent
diff --git a/smartmontools/scsicmds.h b/smartmontools/scsicmds.h
index 10478142118bdc1e64d1cf5a11b20827473f266b..a3fa6f808ead4d0d602f808300a0852659fdbf49 100644
--- a/smartmontools/scsicmds.h
+++ b/smartmontools/scsicmds.h
@@ -7,19 +7,8 @@
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  * Copyright (C) 2003-18 Douglas Gilbert <dgilbert@interlog.com>
  *
- * 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, or (at your option)
- * any later version.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
  *
  * N.B. What was formerly known as "SMART" are now called "informational
  * exceptions" in recent t10.org drafts (i.e. recent SCSI).
diff --git a/smartmontools/scsiprint.cpp b/smartmontools/scsiprint.cpp
index 2f3cc8186d2f419ad2268cc2ccd409c6d36e03ee..cca0dcccc765c03414ff31f70be11dca9cdb02c7 100644
--- a/smartmontools/scsiprint.cpp
+++ b/smartmontools/scsiprint.cpp
@@ -7,20 +7,7 @@
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  * Copyright (C) 2003-18 Douglas Gilbert <dgilbert@interlog.com>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
diff --git a/smartmontools/scsiprint.h b/smartmontools/scsiprint.h
index a413e234bcc57b7fbc9e90ad46c5f9550823d6bc..9e3e50064ed286354eb3e27d931107b6ab7f054e 100644
--- a/smartmontools/scsiprint.h
+++ b/smartmontools/scsiprint.h
@@ -9,20 +9,7 @@
  * Additional SCSI work:
  * Copyright (C) 2003-18 Douglas Gilbert <dgilbert@interlog.com>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
diff --git a/smartmontools/smartctl.8.in b/smartmontools/smartctl.8.in
index 4238f8ac5a5a3d8d8221a6b242a9eba4e7ce6f38..ea17c2243936ebf4146c3582b327ad4ac6bfef05 100644
--- a/smartmontools/smartctl.8.in
+++ b/smartmontools/smartctl.8.in
@@ -2,20 +2,9 @@
 Copyright (C) 2002-10 Bruce Allen
 Copyright (C) 2004-18 Christian Franke
 
-$Id$
-
-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, or (at your option)
-any later version.
+SPDX-License-Identifier: GPL-2.0-or-later
 
-You should have received a copy of the GNU General Public License
-(for example COPYING); If not, see <http://www.gnu.org/licenses/>.
-
-This code was originally developed as a Senior Thesis by Michael Cornwell
-at the Concurrent Systems Laboratory (now part of the Storage Systems
-Research Center), Jack Baskin School of Engineering, University of
-California, Santa Cruz. http://ssrc.soe.ucsc.edu/
+$Id$
 
 ..
 .\" Macros borrowed from pages generated with Pod::Man
diff --git a/smartmontools/smartctl.cpp b/smartmontools/smartctl.cpp
index a4e07fa738d7523de33c1bb7bd13348d76e62c09..9e5836320ce1bf83d4c791342d2bd9dc6b3becd9 100644
--- a/smartmontools/smartctl.cpp
+++ b/smartmontools/smartctl.cpp
@@ -7,19 +7,7 @@
  * Copyright (C) 2008-18 Christian Franke
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/smartctl.h b/smartmontools/smartctl.h
index 8307ca6f6062298162d7440156fa6fce3e7262a9..318b26c656c987af9410da972782fd5f00bde310 100644
--- a/smartmontools/smartctl.h
+++ b/smartmontools/smartctl.h
@@ -7,20 +7,7 @@
  * Copyright (C) 2008-17 Christian Franke
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef SMARTCTL_H_
diff --git a/smartmontools/smartd.8.in b/smartmontools/smartd.8.in
index ba60c59fdbfc37f29b37492e8d478bc1342e7b86..14e9a136aee6325a3155c14f417345b8525884f0 100644
--- a/smartmontools/smartd.8.in
+++ b/smartmontools/smartd.8.in
@@ -2,20 +2,9 @@
 Copyright (C) 2002-10 Bruce Allen
 Copyright (C) 2004-17 Christian Franke
 
-$Id$
-
-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, or (at your option)
-any later version.
+SPDX-License-Identifier: GPL-2.0-or-later
 
-You should have received a copy of the GNU General Public License
-(for example COPYING); If not, see <http://www.gnu.org/licenses/>.
-
-This code was originally developed as a Senior Thesis by Michael Cornwell
-at the Concurrent Systems Laboratory (now part of the Storage Systems
-Research Center), Jack Baskin School of Engineering, University of
-California, Santa Cruz. http://ssrc.soe.ucsc.edu/
+$Id$
 
 ..
 .\" Macros borrowed from pages generated with Pod::Man
diff --git a/smartmontools/smartd.conf.5.in b/smartmontools/smartd.conf.5.in
index cfb34865e0da7543ceb04bf3fc942233478b0162..76fb7aeb58e5b21a3cb7f6acaaa9af0c756cb39e 100644
--- a/smartmontools/smartd.conf.5.in
+++ b/smartmontools/smartd.conf.5.in
@@ -2,20 +2,9 @@
 Copyright (C) 2002-10 Bruce Allen
 Copyright (C) 2004-18 Christian Franke
 
-$Id$
-
-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, or (at your option)
-any later version.
+SPDX-License-Identifier: GPL-2.0-or-later
 
-You should have received a copy of the GNU General Public License
-(for example COPYING); If not, see <http://www.gnu.org/licenses/>.
-
-This code was originally developed as a Senior Thesis by Michael Cornwell
-at the Concurrent Systems Laboratory (now part of the Storage Systems
-Research Center), Jack Baskin School of Engineering, University of
-California, Santa Cruz. http://ssrc.soe.ucsc.edu/
+$Id$
 
 ..
 .\" Macros borrowed from pages generated with Pod::Man
diff --git a/smartmontools/smartd.cpp b/smartmontools/smartd.cpp
index cd190d9b04efed5460169e7bc6c3093944a474b9..75f0b8157b2cda9855c9d858a65a623ea54ac0de 100644
--- a/smartmontools/smartd.cpp
+++ b/smartmontools/smartd.cpp
@@ -6,19 +6,7 @@
  * Copyright (C) 2000    Michael Cornwell <cornwell@acm.org>
  * Copyright (C) 2008    Oliver Bock <brevilo@users.sourceforge.net>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
diff --git a/smartmontools/smartd.cygwin.initd.in b/smartmontools/smartd.cygwin.initd.in
index 84ef0bd557ee8b476921edf121fbb1064951a7fa..18e81ed752f9b50cbe9bdcafbac5b924d2e5009a 100644
--- a/smartmontools/smartd.cygwin.initd.in
+++ b/smartmontools/smartd.cygwin.initd.in
@@ -6,13 +6,7 @@
 #
 # Copyright (C) 2004-17 Christian Franke
 #
-# 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, or (at your option)
-# any later version.
-#
-# You should have received a copy of the GNU General Public License
-# (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # $Id$
 #
diff --git a/smartmontools/smartd.initd.in b/smartmontools/smartd.initd.in
index eef688b96172c113e81cc2734e7e344a94286ee8..d4da241b927923542d7650805e4777b51d3f2ce7 100644
--- a/smartmontools/smartd.initd.in
+++ b/smartmontools/smartd.initd.in
@@ -2,6 +2,7 @@
 
 # smartmontools init file for smartd
 # Copyright (C) 2002-8 Bruce Allen
+# SPDX-License-Identifier: GPL-2.0-or-later
 # $Id$
 
 # For RedHat and cousins:
@@ -22,18 +23,6 @@
 # Description:                Start S.M.A.R.T. disk and tape monitor.
 ### END INIT INFO
 
-# 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, or (at your option) any later
-# version. 
-# You should have received a copy of the GNU General Public License (for
-# example COPYING); if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-# This code was originally developed as a Senior Thesis by Michael Cornwell
-# at the Concurrent Systems Laboratory (now part of the Storage Systems
-# Research Center), Jack Baskin School of Engineering, University of
-# California, Santa Cruz. http://ssrc.soe.ucsc.edu/.
-
 # Uncomment the line below to pass options to smartd on startup. 
 # Note that distribution specific configuration files like
 # /etc/{default,sysconfig}/smartmontools might override these
diff --git a/smartmontools/smartd_warning.sh.in b/smartmontools/smartd_warning.sh.in
index 721383682d8acd4c59bd61828598bf6d0381d93b..f4613dd43362f21396ab4c45e15a3a4f09fdf5c7 100644
--- a/smartmontools/smartd_warning.sh.in
+++ b/smartmontools/smartd_warning.sh.in
@@ -6,13 +6,7 @@
 #
 # Copyright (C) 2012-16 Christian Franke
 #
-# 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, or (at your option)
-# any later version.
-#
-# You should have received a copy of the GNU General Public License
-# (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # $Id$
 #
diff --git a/smartmontools/update-smart-drivedb.8.in b/smartmontools/update-smart-drivedb.8.in
index 94c374dc806a3107f491f186104fe9b88abc2b26..266840c5cc727264d3270aadd08c7b1131d6bb1f 100644
--- a/smartmontools/update-smart-drivedb.8.in
+++ b/smartmontools/update-smart-drivedb.8.in
@@ -2,15 +2,9 @@
 Copyright (C) 2013 Hannes von Haugwitz <hannes@vonhaugwitz.com>
 Copyright (C) 2014-17 Christian Franke
 
-$Id$
-
-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, or (at your option)
-any later version.
+SPDX-License-Identifier: GPL-2.0-or-later
 
-You should have received a copy of the GNU General Public License
-(for example COPYING); If not, see <http://www.gnu.org/licenses/>.
+$Id$
 
 ..
 .\" Macros borrowed from pages generated with Pod::Man
diff --git a/smartmontools/update-smart-drivedb.in b/smartmontools/update-smart-drivedb.in
index e4a85029fba9f37772f2823509835e5d0aee7e1f..3445e94fdb9631ad95539c10d272701130b453ab 100644
--- a/smartmontools/update-smart-drivedb.in
+++ b/smartmontools/update-smart-drivedb.in
@@ -6,13 +6,7 @@
 #
 # Copyright (C) 2010-17 Christian Franke
 #
-# 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, or (at your option)
-# any later version.
-#
-# You should have received a copy of the GNU General Public License
-# (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # $Id$
 #
diff --git a/smartmontools/utility.cpp b/smartmontools/utility.cpp
index 4ce9cbc3d136acd32da76e577654a9d728198371..c5ac50fd317dccb95586328abba42b3b7e19521e 100644
--- a/smartmontools/utility.cpp
+++ b/smartmontools/utility.cpp
@@ -7,19 +7,7 @@
  * Copyright (C) 2008-18 Christian Franke
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 // THIS FILE IS INTENDED FOR UTILITY ROUTINES THAT ARE APPLICABLE TO
diff --git a/smartmontools/utility.h b/smartmontools/utility.h
index 7e3f991502cd9860be0a1f3b0a45e9a8134dca34..8284bde17224602bf0eef5fe01dc2afbef502c26 100644
--- a/smartmontools/utility.h
+++ b/smartmontools/utility.h
@@ -7,19 +7,7 @@
  * Copyright (C) 2008-18 Christian Franke
  * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
  *
- * 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, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef UTILITY_H_