diff --git a/Makefile b/Makefile
index befbc6b..74fc43d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,5 @@
-#
+#    SPDX-License-Identifier: GPL-3.0-or-later
 #    Copyright © 2016-2021 Amebis
-#
-#    This file is part of Updater.
-#
-#    Updater 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.
-#
-#    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
-#
 
 KEY_DIR=..\include
 
diff --git a/UpdCheck/MSIBuild/Makefile b/UpdCheck/MSIBuild/Makefile
index d6d9604..34d6c4f 100644
Binary files a/UpdCheck/MSIBuild/Makefile and b/UpdCheck/MSIBuild/Makefile differ
diff --git a/UpdCheck/UpdCheck.h b/UpdCheck/UpdCheck.h
index c5085d7..4f67568 100644
--- a/UpdCheck/UpdCheck.h
+++ b/UpdCheck/UpdCheck.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/UpdCheck/UpdCheck.rc b/UpdCheck/UpdCheck.rc
index 0236e63..ad7849b 100644
Binary files a/UpdCheck/UpdCheck.rc and b/UpdCheck/UpdCheck.rc differ
diff --git a/UpdCheck/main.cpp b/UpdCheck/main.cpp
index 51062fc..1179615 100644
--- a/UpdCheck/main.cpp
+++ b/UpdCheck/main.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/UpdCheck/pch.cpp b/UpdCheck/pch.cpp
index 35404c8..aa294a6 100644
--- a/UpdCheck/pch.cpp
+++ b/UpdCheck/pch.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/UpdCheck/pch.h b/UpdCheck/pch.h
index d30d39c..fafdff5 100644
--- a/UpdCheck/pch.h
+++ b/UpdCheck/pch.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/UpdPublish/UpdPublish.h b/UpdPublish/UpdPublish.h
index b8f62eb..8c0a493 100644
--- a/UpdPublish/UpdPublish.h
+++ b/UpdPublish/UpdPublish.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/UpdPublish/UpdPublish.rc b/UpdPublish/UpdPublish.rc
index c3bbbea..89dc637 100644
Binary files a/UpdPublish/UpdPublish.rc and b/UpdPublish/UpdPublish.rc differ
diff --git a/UpdPublish/main.cpp b/UpdPublish/main.cpp
index cfdb8a7..64c1e20 100644
--- a/UpdPublish/main.cpp
+++ b/UpdPublish/main.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/UpdPublish/pch.cpp b/UpdPublish/pch.cpp
index 35404c8..aa294a6 100644
--- a/UpdPublish/pch.cpp
+++ b/UpdPublish/pch.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/UpdPublish/pch.h b/UpdPublish/pch.h
index 7e8dd07..7781f15 100644
--- a/UpdPublish/pch.h
+++ b/UpdPublish/pch.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/UpdSignXML/UpdSignXML.h b/UpdSignXML/UpdSignXML.h
index 7208d6c..f02eb27 100644
--- a/UpdSignXML/UpdSignXML.h
+++ b/UpdSignXML/UpdSignXML.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/UpdSignXML/UpdSignXML.rc b/UpdSignXML/UpdSignXML.rc
index 4efc5b7..59190fa 100644
Binary files a/UpdSignXML/UpdSignXML.rc and b/UpdSignXML/UpdSignXML.rc differ
diff --git a/UpdSignXML/main.cpp b/UpdSignXML/main.cpp
index 3ae22c3..04c08e8 100644
--- a/UpdSignXML/main.cpp
+++ b/UpdSignXML/main.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/UpdSignXML/pch.cpp b/UpdSignXML/pch.cpp
index 35404c8..aa294a6 100644
--- a/UpdSignXML/pch.cpp
+++ b/UpdSignXML/pch.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/UpdSignXML/pch.h b/UpdSignXML/pch.h
index dbed4b6..dc45a3a 100644
--- a/UpdSignXML/pch.h
+++ b/UpdSignXML/pch.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/Updater/MSIBuild/Makefile b/Updater/MSIBuild/Makefile
index 6abba0f..bec94c8 100644
--- a/Updater/MSIBuild/Makefile
+++ b/Updater/MSIBuild/Makefile
@@ -1,21 +1,5 @@
-#
+#    SPDX-License-Identifier: GPL-3.0-or-later
 #    Copyright © 1991-2021 Amebis
-#
-#    This file is part of ZRCola.
-#
-#    ZRCola 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.
-#
-#    ZRCola 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 ZRCola. If not, see <http://www.gnu.org/licenses/>.
-#
 
 !INCLUDE "..\..\..\include\MSIBuildCfg.mak"
 
diff --git a/Updater/include/Updater/chkthread.h b/Updater/include/Updater/chkthread.h
index af05edd..7acdb91 100644
--- a/Updater/include/Updater/chkthread.h
+++ b/Updater/include/Updater/chkthread.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/Updater/include/Updater/common.h b/Updater/include/Updater/common.h
index 5569e73..b6077d2 100644
--- a/Updater/include/Updater/common.h
+++ b/Updater/include/Updater/common.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #if !defined(__UPDATER_common_h__)
diff --git a/Updater/res/Updater.rc b/Updater/res/Updater.rc
index 5524591..bc797b1 100644
Binary files a/Updater/res/Updater.rc and b/Updater/res/Updater.rc differ
diff --git a/Updater/src/chkthread.cpp b/Updater/src/chkthread.cpp
index 343de12..4e031d5 100644
--- a/Updater/src/chkthread.cpp
+++ b/Updater/src/chkthread.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/Updater/src/main.cpp b/Updater/src/main.cpp
index c6ac067..db5c609 100644
--- a/Updater/src/main.cpp
+++ b/Updater/src/main.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/Updater/src/pch.cpp b/Updater/src/pch.cpp
index 35404c8..aa294a6 100644
--- a/Updater/src/pch.cpp
+++ b/Updater/src/pch.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/Updater/src/pch.h b/Updater/src/pch.h
index 2b585bc..ba2608b 100644
--- a/Updater/src/pch.h
+++ b/Updater/src/pch.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of Updater.
-
-    Updater 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.
-
-    Updater 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 Updater. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once