diff --git a/CAB.mak b/CAB.mak
index 3cb6f44..80b55da 100644
--- a/CAB.mak
+++ b/CAB.mak
@@ -1,23 +1,20 @@
 #
-#    MSIBuild, Copyright (C) Amebis, Slovenia
+#    Copyright ("1991-2015") Amebis
 #
-#    This program is free software; you can redistribute it and/or modify
+#    This file is part of MSIBuild.
+#
+#    MSIBuild 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
+#    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
+#    MSIBuild 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.
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
 #
-#    See the GNU General Public License for more details, included in the file
-#    LICENSE.rtf which you should have received along with this program.
-#
-#    If you did not receive a copy of the GNU General Public License,
-#    write to the Free Software Foundation, Inc., 675 Mass Ave,
-#    Cambridge, MA 02139, USA.
-#
-#    Amebis can be contacted at http://www.amebis.si
+#    You should have received a copy of the GNU General Public License
+#    along with MSIBuild. If not, see <http://www.gnu.org/licenses/>.
 #
 
 !IFNDEF MSIBUILD_ROOT
diff --git a/Core/Makefile b/Core/Makefile
index 17d79da..ba7e79e 100644
--- a/Core/Makefile
+++ b/Core/Makefile
@@ -1,23 +1,20 @@
 #
-#    MSIBuild, Copyright (C) Amebis, Slovenia
+#    Copyright ("1991-2015") Amebis
 #
-#    This program is free software; you can redistribute it and/or modify
+#    This file is part of MSIBuild.
+#
+#    MSIBuild 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
+#    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
+#    MSIBuild 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.
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
 #
-#    See the GNU General Public License for more details, included in the file
-#    LICENSE.rtf which you should have received along with this program.
-#
-#    If you did not receive a copy of the GNU General Public License,
-#    write to the Free Software Foundation, Inc., 675 Mass Ave,
-#    Cambridge, MA 02139, USA.
-#
-#    Amebis can be contacted at http://www.amebis.si
+#    You should have received a copy of the GNU General Public License
+#    along with MSIBuild. If not, see <http://www.gnu.org/licenses/>.
 #
 
 !INCLUDE "..\..\include\MSIBuildCfg.mak"
diff --git a/MSI.js b/MSI.js
index 7b5f8a2..8a43609 100644
--- a/MSI.js
+++ b/MSI.js
@@ -1,23 +1,20 @@
 /*
-    MSIBuild, Copyright (C) Amebis, Slovenia
+    Copyright ("1991-2015") Amebis
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of MSIBuild.
+
+    MSIBuild 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
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    MSIBuild 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.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-    See the GNU General Public License for more details, included in the file
-    LICENSE.rtf which you should have received along with this program.
-
-    If you did not receive a copy of the GNU General Public License,
-    write to the Free Software Foundation, Inc., 675 Mass Ave,
-    Cambridge, MA 02139, USA.
-
-    Amebis can be contacted at http://www.amebis.si
+    You should have received a copy of the GNU General Public License
+    along with MSIBuild. If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*@cc_on @*/
@@ -186,8 +183,8 @@ function MSIMergeFiles(files, d)
 // SIG // MIIZKwYJKoZIhvcNAQcCoIIZHDCCGRgCAQExCzAJBgUr
 // SIG // DgMCGgUAMGcGCisGAQQBgjcCAQSgWTBXMDIGCisGAQQB
 // SIG // gjcCAR4wJAIBAQQQEODJBs441BGiowAQS9NQkAIBAAIB
-// SIG // AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFOx6K+gdDy1D
-// SIG // W9Kl8NIKhAppxkyboIIUJTCCA+4wggNXoAMCAQICEH6T
+// SIG // AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFPz5PVg1Xyt5
+// SIG // oHQaTVKzM0Ml51JjoIIUJTCCA+4wggNXoAMCAQICEH6T
 // SIG // 6/t8xk5Z6kuad9QG/DswDQYJKoZIhvcNAQEFBQAwgYsx
 // SIG // CzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENh
 // SIG // cGUxFDASBgNVBAcTC0R1cmJhbnZpbGxlMQ8wDQYDVQQK
@@ -353,30 +350,30 @@ function MSIMergeFiles(files, d)
 // SIG // lwQonpQDAhobMAkGBSsOAwIaBQCgcDAQBgorBgEEAYI3
 // SIG // AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIB
 // SIG // BDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAj
-// SIG // BgkqhkiG9w0BCQQxFgQURtYjxRggLss8yAsrQC9lrvNH
-// SIG // m3UwDQYJKoZIhvcNAQEBBQAEggEAijCj9dE91/JVXdc/
-// SIG // 67+8fr+u+cituHZ8M0gqY03kTOJ7V5OoMsmXAvWgpwUO
-// SIG // RxqfOIqvyXoUPuZ/bAVvUJwwxkk/if2J97iNQKxH+8s3
-// SIG // soqdDxBQRVouF09+u71RkdigheFvF2U/nwVzxD9E5RQ7
-// SIG // woNEWaRNBIYzT+zDlBslw7Kzvx0nmiEOVXXPG4tfweig
-// SIG // 80GDTPKVTG1ovJcRkwaOsPDUV0mevVm5zzyaGSU5a+LY
-// SIG // cXnOLCaiVIS040CnMLBzzud/KouFPf13HKoywFbNZUaA
-// SIG // XjiugjCGiBfW4WrW9GIupGxfNPBqAkTD76EVLmN2Y+TJ
-// SIG // zTZMeWca27TFXXIxr6GCAgswggIHBgkqhkiG9w0BCQYx
+// SIG // BgkqhkiG9w0BCQQxFgQUjvy9ZNHXPa3pGX9PZxg3wsxb
+// SIG // U1swDQYJKoZIhvcNAQEBBQAEggEAnzVXRmCw9wuqPVJ5
+// SIG // Qvtmz2rgVmkcBG958gRPiXYnBt1FAVC4hYzAfOzbsO60
+// SIG // k5uhgApHEGGXshI67359Wkk182AkHyF9dv8FhkLTeKX8
+// SIG // wGTtxt3UMxu8Tz43nH20fJ3um+CBXExvW73tShNsaHF6
+// SIG // XIFUEPslwepiULbWU+izHtBmER2Hvcg+jbpLmOpY2fpF
+// SIG // Hb8MoIuIxpg8E311ATn8HZAWfm0bcsxaqaMKyC/YZR0Y
+// SIG // gENi6oW/Vf6pOWyYiNDWLGlku+iVOd3VpQ8T+yvMhwE4
+// SIG // IVbVqcvnk0hiXh174Xd4skCvHrULq+zuH3E3h03jH+ek
+// SIG // p3MJzpYDhMWUgHrUZqGCAgswggIHBgkqhkiG9w0BCQYx
 // SIG // ggH4MIIB9AIBATByMF4xCzAJBgNVBAYTAlVTMR0wGwYD
 // SIG // VQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEwMC4GA1UE
 // SIG // AxMnU3ltYW50ZWMgVGltZSBTdGFtcGluZyBTZXJ2aWNl
 // SIG // cyBDQSAtIEcyAhAOz/Q4yP6/NW4E2GqYGxpQMAkGBSsO
 // SIG // AwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcB
-// SIG // MBwGCSqGSIb3DQEJBTEPFw0xNTAyMjQxMTI4NDVaMCMG
-// SIG // CSqGSIb3DQEJBDEWBBSAsLkX/ftk9AEQDSSKDR2hyiav
-// SIG // iTANBgkqhkiG9w0BAQEFAASCAQCd1Mkuc4pq+vWZUiZU
-// SIG // hjZEVVupIxUB/tmh7uzL8m3Ayyuy3KbceWtLGsvKR76X
-// SIG // vEQefxtK3D6P9u3uDMXg4aNeCG75j9FSRQ6+uGa3m+eG
-// SIG // 35xwbi2J3dLEnN+ZZN1kPGsGswDvI/sBpuBfZ2CIuNX2
-// SIG // r/rYqPHQF+gAkfUYALCadZI2nhx/Zg88JiBJfk1G6oQU
-// SIG // QG4akVGB4y52SS2wS2CxQpGE0PMcARXXADIgYGHet+lB
-// SIG // aeh95tu4qGfBZZoLJWHbi4And5YR8hJkp4YJHRRat7jq
-// SIG // 82kPy7mL61g5KEBxElIuQuihgT/ew/8qyUpm1QXmcu6e
-// SIG // Ihs2VQeBHJy8voE5
+// SIG // MBwGCSqGSIb3DQEJBTEPFw0xNTAyMjQxMzE3NTRaMCMG
+// SIG // CSqGSIb3DQEJBDEWBBQBtrdYI0Kf1MYRpRC4ym1zwBXh
+// SIG // XzANBgkqhkiG9w0BAQEFAASCAQCFC4N73bvrPphbOPFJ
+// SIG // fymwGP8y5lxsSF/Ax9C7tIuHVxw6p56p/lgt54dQ66iZ
+// SIG // FnnoQqEC4JwKjArcroQslpWAz3hoXj7yDnv4jve/gauE
+// SIG // wy6nMGwoCQvxzd4E97m0xLPlRpixP6ne237viHTfhbqn
+// SIG // YLnlRVGiBT9hSxfIL+QWhIT6WHu/6nOsr0iO6jw5vh4n
+// SIG // d5N9gfFMxYDbk5h2/9J4zi9sXD/0wIExg0MpRbUppqwq
+// SIG // 1N5uEkxU8VGp8AOcr/G/jw8SM3cpRWs0GdIKHxqZVqSm
+// SIG // JVqIDgPUFisyZaZI/D/sMRetZ6Uz3GgMFMT/hhYoYkk0
+// SIG // 4Z5MYEEBbwrwgFz9
 // SIG // End signature block
diff --git a/MSI.wsf b/MSI.wsf
index a2f899a..641a359 100644
--- a/MSI.wsf
+++ b/MSI.wsf
@@ -1,24 +1,21 @@
 <?xml version="1.0"?>
 <!--
-    MSIBuild, Copyright (C) Amebis, Slovenia
+    Copyright ("1991-2015") Amebis
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of MSIBuild.
+
+    MSIBuild 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
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    MSIBuild 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.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-    See the GNU General Public License for more details, included in the file
-    LICENSE.rtf which you should have received along with this program.
-
-    If you did not receive a copy of the GNU General Public License,
-    write to the Free Software Foundation, Inc., 675 Mass Ave,
-    Cambridge, MA 02139, USA.
-
-    Amebis can be contacted at http://www.amebis.si
+    You should have received a copy of the GNU General Public License
+    along with MSIBuild. If not, see <http://www.gnu.org/licenses/>.
 -->
 <package>
 	<job id="MakeDDF">
@@ -314,8 +311,8 @@
 ** SIG ** MIIZKwYJKoZIhvcNAQcCoIIZHDCCGRgCAQExCzAJBgUr
 ** SIG ** DgMCGgUAMGcGCisGAQQBgjcCAQSgWTBXMDIGCisGAQQB
 ** SIG ** gjcCAR4wJAIBAQQQcAVhGs441BGiowAQS9NQkAIBAAIB
-** SIG ** AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFAhFf223lUqN
-** SIG ** 1ofOmCjMWGcEmn2WoIIUJTCCA+4wggNXoAMCAQICEH6T
+** SIG ** AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFBnfkiLAQPNe
+** SIG ** uduo8tkY1bErzpB+oIIUJTCCA+4wggNXoAMCAQICEH6T
 ** SIG ** 6/t8xk5Z6kuad9QG/DswDQYJKoZIhvcNAQEFBQAwgYsx
 ** SIG ** CzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENh
 ** SIG ** cGUxFDASBgNVBAcTC0R1cmJhbnZpbGxlMQ8wDQYDVQQK
@@ -481,31 +478,31 @@
 ** SIG ** lwQonpQDAhobMAkGBSsOAwIaBQCgcDAQBgorBgEEAYI3
 ** SIG ** AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIB
 ** SIG ** BDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAj
-** SIG ** BgkqhkiG9w0BCQQxFgQUHnKYZ6Q9LLDo8Fv/B6KTWSAD
-** SIG ** xdUwDQYJKoZIhvcNAQEBBQAEggEA9NZmXISH72fAQqzX
-** SIG ** LVVCtg7okiNdnkXVR2vuklkG7elRuQ1fw06+sb/0l9H+
-** SIG ** ocd9PQ2Ozy3WxQzJfueaNitzTNj6jSVApQkSwywi66sq
-** SIG ** zxO7riR20I5Yqp3lZ7SwJ5y92ocS2D2K/T4CVJlQAfm3
-** SIG ** AaFB60AGlZHcwt/FcXanM+WjYbdda6Wan6yZtEPqb/4B
-** SIG ** GjBVNw19bFQMKgtvF5nEuuv1zZyEPlviaO3iw6nWIUdQ
-** SIG ** 8N3GlQxOI9m46G2bPol4KOoG9QDLiWuzlUOgKPxa7rFn
-** SIG ** FoT3ngCwkahlhMf1CGNNX0Gsb1gIAkYUomQrKP5Q9UGW
-** SIG ** tyP0URNIMq27eTeWW6GCAgswggIHBgkqhkiG9w0BCQYx
+** SIG ** BgkqhkiG9w0BCQQxFgQUfhQKopLeSNSTwZv49hF8tPkg
+** SIG ** CNcwDQYJKoZIhvcNAQEBBQAEggEA79g8h4xAMeQ1GWYE
+** SIG ** WlA1e4npvSH+BW9kgEJ7NY441JuTK43amIbH8v8fh87J
+** SIG ** BSv1/QO7wVAlk77PtP0KMuy3vE+l35JsSZ7nFgoxLBaR
+** SIG ** JHhLCNRxaS6Iwy6nvN0tWwHst4nTYt4ybLUXJN/o1jxH
+** SIG ** IvudmLh8oM/Meq6zoAbAzuS0EVbM2qu6URep4+HWg0pT
+** SIG ** MhWK4hIjPKfaHx+0cAB/nipE1OyeVxi8XjxZhWLdRNk5
+** SIG ** uKvOZf7qSyF2FHSWv99/B2txKrPNLCUEYp8020bWd2Nm
+** SIG ** aS2ecje0GSh1QWKd+UR/JiW6CTtaVdg+o0HJtAAABGTN
+** SIG ** jbe6AIMb6TstlZ9HGqGCAgswggIHBgkqhkiG9w0BCQYx
 ** SIG ** ggH4MIIB9AIBATByMF4xCzAJBgNVBAYTAlVTMR0wGwYD
 ** SIG ** VQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEwMC4GA1UE
 ** SIG ** AxMnU3ltYW50ZWMgVGltZSBTdGFtcGluZyBTZXJ2aWNl
 ** SIG ** cyBDQSAtIEcyAhAOz/Q4yP6/NW4E2GqYGxpQMAkGBSsO
 ** SIG ** AwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcB
-** SIG ** MBwGCSqGSIb3DQEJBTEPFw0xNTAyMjQxMTI4NTVaMCMG
-** SIG ** CSqGSIb3DQEJBDEWBBR0gU9uVcCf4tR9qfeVwcc7GtT/
-** SIG ** CjANBgkqhkiG9w0BAQEFAASCAQCLx64CQArM2v6qSTeB
-** SIG ** t6PfwN3+S1iNtgyYhpE4y3W02fEI5g8nBbYzeeUDo6Fi
-** SIG ** mA+bU3zDfHTKhpRv3AeKITyyIegwN83iWCG+WTOPRKFe
-** SIG ** EyOx2AiWSNxugTrRALGuv1P+4glVWdawjlJ5LFpHXK4c
-** SIG ** 8wJeNIKRDfp+OjDWuEjLMZkFaSfaODTL/bl6/CUzSAb3
-** SIG ** v5IVtN8srdk8HHM+H0fEOQB6CN2A6nhSD85xJysGmuSQ
-** SIG ** XmwUjomYKh+lvok1OHRnIeXdqdLkQlT98VFsmrSNvjG0
-** SIG ** JOF0ORsSGwm7jXTf/bQgKT9D0rYFNj4E1J35TLYJspYY
-** SIG ** NhqRa5nx0IdhBMNk
+** SIG ** MBwGCSqGSIb3DQEJBTEPFw0xNTAyMjQxMzE5MzJaMCMG
+** SIG ** CSqGSIb3DQEJBDEWBBT5S8CWnmvT5wuWKZ9rM45mbLPZ
+** SIG ** LjANBgkqhkiG9w0BAQEFAASCAQCS69l0LanfxRKQEZfQ
+** SIG ** Nzhe97Fm+I+LCxkzPZCGa7M07iwQZCGll8FhyYA57IgT
+** SIG ** gjvZ6MlknYn6gd4l0rtmzpbcIFQMDk1+la5XXFy02CdA
+** SIG ** ufHcR1HYTDDDoGlpH5XGE+ZiwyoamfFhPypzrI4SiENC
+** SIG ** IUvlcNN9OWITlmritKYIBDPYZDAs4H+YOzsmqbr4ImAb
+** SIG ** SEOuPG1wWEUKPHqcfws/WjM/rMAmXuPkpsL9IsEkWaEa
+** SIG ** N/hVbAaz+Ojy2mDgqPLGdonI2lNmFZp+PLdwFxLsxA7H
+** SIG ** 7mg5wYrNIVRRBYnGgdHokMswP+kteKRPtmJiUclXpzje
+** SIG ** 9YLvDAYv3AAj35Zh
 </signature>
 </package>
diff --git a/MSM.mak b/MSM.mak
index 2cb9ef6..8866068 100644
--- a/MSM.mak
+++ b/MSM.mak
@@ -1,23 +1,20 @@
 #
-#    MSIBuild, Copyright (C) Amebis, Slovenia
+#    Copyright ("1991-2015") Amebis
 #
-#    This program is free software; you can redistribute it and/or modify
+#    This file is part of MSIBuild.
+#
+#    MSIBuild 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
+#    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
+#    MSIBuild 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.
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
 #
-#    See the GNU General Public License for more details, included in the file
-#    LICENSE.rtf which you should have received along with this program.
-#
-#    If you did not receive a copy of the GNU General Public License,
-#    write to the Free Software Foundation, Inc., 675 Mass Ave,
-#    Cambridge, MA 02139, USA.
-#
-#    Amebis can be contacted at http://www.amebis.si
+#    You should have received a copy of the GNU General Public License
+#    along with MSIBuild. If not, see <http://www.gnu.org/licenses/>.
 #
 
 !IFNDEF MSIBUILD_MSM_BASE
diff --git a/Makefile b/Makefile
index 06b2f22..a584c50 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,20 @@
 #
-#    MSIBuild, Copyright (C) Amebis, Slovenia
+#    Copyright ("1991-2015") Amebis
 #
-#    This program is free software; you can redistribute it and/or modify
+#    This file is part of MSIBuild.
+#
+#    MSIBuild 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
+#    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
+#    MSIBuild 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.
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
 #
-#    See the GNU General Public License for more details, included in the file
-#    LICENSE.rtf which you should have received along with this program.
-#
-#    If you did not receive a copy of the GNU General Public License,
-#    write to the Free Software Foundation, Inc., 675 Mass Ave,
-#    Cambridge, MA 02139, USA.
-#
-#    Amebis can be contacted at http://www.amebis.si
+#    You should have received a copy of the GNU General Public License
+#    along with MSIBuild. If not, see <http://www.gnu.org/licenses/>.
 #
 
 ######################################################################
diff --git a/String.js b/String.js
index 7bfd19b..a420e71 100644
--- a/String.js
+++ b/String.js
@@ -1,23 +1,20 @@
 /*
-    MSIBuild, Copyright (C) Amebis, Slovenia
+    Copyright ("1991-2015") Amebis
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of MSIBuild.
+
+    MSIBuild 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
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    MSIBuild 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.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-    See the GNU General Public License for more details, included in the file
-    LICENSE.rtf which you should have received along with this program.
-
-    If you did not receive a copy of the GNU General Public License,
-    write to the Free Software Foundation, Inc., 675 Mass Ave,
-    Cambridge, MA 02139, USA.
-
-    Amebis can be contacted at http://www.amebis.si
+    You should have received a copy of the GNU General Public License
+    along with MSIBuild. If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*@cc_on @*/
@@ -86,8 +83,8 @@ function Time2Str(date)
 // SIG // MIIZKwYJKoZIhvcNAQcCoIIZHDCCGRgCAQExCzAJBgUr
 // SIG // DgMCGgUAMGcGCisGAQQBgjcCAQSgWTBXMDIGCisGAQQB
 // SIG // gjcCAR4wJAIBAQQQEODJBs441BGiowAQS9NQkAIBAAIB
-// SIG // AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFDJyxoFzKd/S
-// SIG // LmN7XBHKqWuLBvsEoIIUJTCCA+4wggNXoAMCAQICEH6T
+// SIG // AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFDQcxGMM45Vg
+// SIG // S9Jo/ZEqicmVS59koIIUJTCCA+4wggNXoAMCAQICEH6T
 // SIG // 6/t8xk5Z6kuad9QG/DswDQYJKoZIhvcNAQEFBQAwgYsx
 // SIG // CzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENh
 // SIG // cGUxFDASBgNVBAcTC0R1cmJhbnZpbGxlMQ8wDQYDVQQK
@@ -253,30 +250,30 @@ function Time2Str(date)
 // SIG // lwQonpQDAhobMAkGBSsOAwIaBQCgcDAQBgorBgEEAYI3
 // SIG // AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIB
 // SIG // BDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAj
-// SIG // BgkqhkiG9w0BCQQxFgQUrje1EXXlU+CNU5rDURJmP7QZ
-// SIG // TdUwDQYJKoZIhvcNAQEBBQAEggEAB8gSEv33ZX+44aZQ
-// SIG // 8cx70Ofo4L3KqtltXPf+9U671ivASWDbXdVJT1u039yS
-// SIG // QIEEUb4w7S6L8/jPMG0Wm0UnRzYuB3H7jTFQ+EZYAHEf
-// SIG // 2Ijz4So6SSFgrLcgjGT9gBWHty5L71s3B+1pu4YEqjbo
-// SIG // iY8RyehIBHNEzLD75yVMFsurl6+COQ/Hq87PGkSE6MCf
-// SIG // UXP6OnY0nhJVOJspdDgMiQ4fdGdAr8h9UpoHKK4KHgKa
-// SIG // DhL5WTQwSnT+mBk+3COCJAa1GJowsiNpgsjcqhZWKCEI
-// SIG // lCxw3I0SvN3Sbo3Jv+EHfKl2a8WNaSgi1fZEwjAMMn9A
-// SIG // tnBre1tiQrtQ5/4UwqGCAgswggIHBgkqhkiG9w0BCQYx
+// SIG // BgkqhkiG9w0BCQQxFgQU/FTIXZrFTyky55ukQi//yJU6
+// SIG // 4vEwDQYJKoZIhvcNAQEBBQAEggEAUxkTWkt/SaahwUa7
+// SIG // 2jYhBO7uv51fExasTMhrF1JsVGFmxJruFu6dgxcUiMvL
+// SIG // 23aiiPvSp48/z15KZrkac7A+AhGRcaSj5Cr6vy4FWG7y
+// SIG // agDf5CBtBTqBO7cGOkCQqzs//vK0KeCpNyQFyvuu1Uow
+// SIG // d0ciOYM0/x5Eg/NN/jgeZVkw1FgZf7BRNusa3dXS9/7K
+// SIG // jB+brCy9eqf3so0cYGjR7Xw+hyWo59b+1qiXUcsecIMD
+// SIG // CNCS+3jim3n52aFYC+zTfGQf1MKXCpwIACx5MV4e5dHB
+// SIG // rN0cP1L5wrYkMym7xBU1E2ssCbtL5sduvOCzz10B/Eoz
+// SIG // kmOv0ozrw9/LIZY/MaGCAgswggIHBgkqhkiG9w0BCQYx
 // SIG // ggH4MIIB9AIBATByMF4xCzAJBgNVBAYTAlVTMR0wGwYD
 // SIG // VQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEwMC4GA1UE
 // SIG // AxMnU3ltYW50ZWMgVGltZSBTdGFtcGluZyBTZXJ2aWNl
 // SIG // cyBDQSAtIEcyAhAOz/Q4yP6/NW4E2GqYGxpQMAkGBSsO
 // SIG // AwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcB
-// SIG // MBwGCSqGSIb3DQEJBTEPFw0xNTAyMjQxMTI4NDdaMCMG
-// SIG // CSqGSIb3DQEJBDEWBBR/Nst4vnT79T6Wrj8kEvATXyKh
-// SIG // RTANBgkqhkiG9w0BAQEFAASCAQBB8Ei2+jrscI001ATU
-// SIG // hYUx01S8kVEadrmYQYJUGKv/iZbVwbEXjs5kT342bR2b
-// SIG // 65LZkovgJ7bXNX5ROdYrkcVFrfX7+vsYL9h7pBLV1/8w
-// SIG // L6F0dlikr3DKdS2WDNq9lYrlEey0TObc5sz43/PN7Am8
-// SIG // njJoHGzEjjvnvs5TwTuDpmILQ6OzTOdrZKUYij8C5QgC
-// SIG // nYajXcuAttDhjq9YYcgojzlA0NKCcDuqWMyas++d13qc
-// SIG // QQ3O9nDI+nR3ZLcROUk4HljOZuv83VgJN1gVMPGBtMSV
-// SIG // Y9lZ17Liqrosgpp1zp5YdtrgZd6hhxXPpcNgVECyRWaR
-// SIG // mX0uYGurSKEaZo3H
+// SIG // MBwGCSqGSIb3DQEJBTEPFw0xNTAyMjQxMzE5NTFaMCMG
+// SIG // CSqGSIb3DQEJBDEWBBSllBjdUqOyZLON9cmLvBZFudXt
+// SIG // ZTANBgkqhkiG9w0BAQEFAASCAQCfP1XNBHemzptuZVu4
+// SIG // rlux8JUtENH8SEqF4bX4bT8usqy0uP9U5yZQ0AB9sAOY
+// SIG // IEUNs1HRntwdrM1gHvTEqbAgHZ+Q7yNBWiw/yzAN8MRF
+// SIG // w2cVbqbEExAywQo1BF7RZ5J3i7cPKiQbPyQC6SaZf2ly
+// SIG // lkUzdcLxGPUV6pfs2JB9g2Ak3HNE005Qnk+l+fOuKxQf
+// SIG // 4vEbizPygA5ZyBBc9ouINID4NYN3QfNgHkesy+cMUuNq
+// SIG // 3DAHeO20mAY6Yn9vjvIcp5Dj8/en49MgbDwaHOR3GQC6
+// SIG // UGFjtbLh9sUhuXGc95eZxwB46TXRzjUN7YIuvHDbRvAT
+// SIG // inD6LijMK0ESl2Cy
 // SIG // End signature block
diff --git a/UI/Makefile b/UI/Makefile
index cec6233..476f137 100644
--- a/UI/Makefile
+++ b/UI/Makefile
@@ -1,23 +1,20 @@
 #
-#    MSIBuild, Copyright (C) Amebis, Slovenia
+#    Copyright ("1991-2015") Amebis
 #
-#    This program is free software; you can redistribute it and/or modify
+#    This file is part of MSIBuild.
+#
+#    MSIBuild 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
+#    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
+#    MSIBuild 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.
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
 #
-#    See the GNU General Public License for more details, included in the file
-#    LICENSE.rtf which you should have received along with this program.
-#
-#    If you did not receive a copy of the GNU General Public License,
-#    write to the Free Software Foundation, Inc., 675 Mass Ave,
-#    Cambridge, MA 02139, USA.
-#
-#    Amebis can be contacted at http://www.amebis.si
+#    You should have received a copy of the GNU General Public License
+#    along with MSIBuild. If not, see <http://www.gnu.org/licenses/>.
 #
 
 !INCLUDE "..\..\include\MSIBuildCfg.mak"
diff --git a/Version/Makefile b/Version/Makefile
index bda9a49..b08eac8 100644
--- a/Version/Makefile
+++ b/Version/Makefile
@@ -1,23 +1,20 @@
 #
-#    MSIBuild, Copyright (C) Amebis, Slovenia
+#    Copyright ("1991-2015") Amebis
 #
-#    This program is free software; you can redistribute it and/or modify
+#    This file is part of MSIBuild.
+#
+#    MSIBuild 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
+#    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
+#    MSIBuild 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.
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
 #
-#    See the GNU General Public License for more details, included in the file
-#    LICENSE.rtf which you should have received along with this program.
-#
-#    If you did not receive a copy of the GNU General Public License,
-#    write to the Free Software Foundation, Inc., 675 Mass Ave,
-#    Cambridge, MA 02139, USA.
-#
-#    Amebis can be contacted at http://www.amebis.si
+#    You should have received a copy of the GNU General Public License
+#    along with MSIBuild. If not, see <http://www.gnu.org/licenses/>.
 #
 
 !INCLUDE "..\..\include\MSIBuildCfg.mak"