diff --git a/MSIBuild/Makefile b/MSIBuild/Makefile
index 4cbfc06..f6ba753 100644
Binary files a/MSIBuild/Makefile and b/MSIBuild/Makefile differ
diff --git a/include/MSICALib.h b/include/MSICALib.h
index c5e8233..5609fa9 100644
--- a/include/MSICALib.h
+++ b/include/MSICALib.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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 3 of the License, or
-    (at your option) any later version.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/src/MSICALib.cpp b/src/MSICALib.cpp
index 3fe6705..123f16a 100644
--- a/src/MSICALib.cpp
+++ b/src/MSICALib.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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 3 of the License, or
-    (at your option) any later version.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/OpCert.cpp b/src/OpCert.cpp
index f4f17d6..62544f7 100644
--- a/src/OpCert.cpp
+++ b/src/OpCert.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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 3 of the License, or
-    (at your option) any later version.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/OpFile.cpp b/src/OpFile.cpp
index 935dee1..753fa65 100644
--- a/src/OpFile.cpp
+++ b/src/OpFile.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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 3 of the License, or
-    (at your option) any later version.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/OpReg.cpp b/src/OpReg.cpp
index a5145e3..ecdb3ce 100644
--- a/src/OpReg.cpp
+++ b/src/OpReg.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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 3 of the License, or
-    (at your option) any later version.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/OpSvc.cpp b/src/OpSvc.cpp
index 7acf58d..8a64d36 100644
--- a/src/OpSvc.cpp
+++ b/src/OpSvc.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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 3 of the License, or
-    (at your option) any later version.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/OpTS.cpp b/src/OpTS.cpp
index 500d92a..b3031b6 100644
--- a/src/OpTS.cpp
+++ b/src/OpTS.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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 3 of the License, or
-    (at your option) any later version.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/OpWLAN.cpp b/src/OpWLAN.cpp
index 6742406..1bff97a 100644
--- a/src/OpWLAN.cpp
+++ b/src/OpWLAN.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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 3 of the License, or
-    (at your option) any later version.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/pch.cpp b/src/pch.cpp
index 8870aef..cdf9bd2 100644
--- a/src/pch.cpp
+++ b/src/pch.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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 3 of the License, or
-    (at your option) any later version.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/pch.h b/src/pch.h
index c77c747..9c86bb6 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA 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 3 of the License, or
-    (at your option) any later version.
-
-    MSICA 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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once