diff --git a/MSICA/MSIBuild/Makefile b/MSICA/MSIBuild/Makefile
index a210231..41e12ce 100644
--- a/MSICA/MSIBuild/Makefile
+++ b/MSICA/MSIBuild/Makefile
@@ -1,23 +1,20 @@
 #
-#    MSICA, 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 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 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,
+#    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.
+#    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 #
 
 !INCLUDE "..\..\..\include\MSIBuildCfg.mak"
diff --git a/MSICA/MSICA.cpp b/MSICA/MSICA.cpp
index 78402ea..8efde2e 100644
--- a/MSICA/MSICA.cpp
+++ b/MSICA/MSICA.cpp
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdafx.h"
diff --git a/MSICA/MSICA.h b/MSICA/MSICA.h
index acdac54..258038a 100644
--- a/MSICA/MSICA.h
+++ b/MSICA/MSICA.h
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __MSICA_H__
diff --git a/MSICA/res/MSICA.rc b/MSICA/res/MSICA.rc
index d10f314..d40bf75 100644
Binary files a/MSICA/res/MSICA.rc and b/MSICA/res/MSICA.rc differ
diff --git a/MSICA/res/MSICA.rcx b/MSICA/res/MSICA.rcx
index fca0709..d2b3dbc 100644
Binary files a/MSICA/res/MSICA.rcx and b/MSICA/res/MSICA.rcx differ
diff --git a/MSICA/stdafx.cpp b/MSICA/stdafx.cpp
index 2a7ca0c..c75333f 100644
--- a/MSICA/stdafx.cpp
+++ b/MSICA/stdafx.cpp
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdafx.h"
diff --git a/MSICA/stdafx.h b/MSICA/stdafx.h
index 707adc0..944a81f 100644
--- a/MSICA/stdafx.h
+++ b/MSICA/stdafx.h
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/MSICALib/MSIBuild/Makefile b/MSICALib/MSIBuild/Makefile
index 57a46be..66b3799 100644
--- a/MSICALib/MSIBuild/Makefile
+++ b/MSICALib/MSIBuild/Makefile
@@ -1,23 +1,20 @@
 #
-#    MSICA, 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 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 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,
+#    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.
+#    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 #
 
 !INCLUDE "..\..\..\include\MSIBuildCfg.mak"
diff --git a/MSICALib/MSICALib.cpp b/MSICALib/MSICALib.cpp
index 1214c8c..881bd4f 100644
--- a/MSICALib/MSICALib.cpp
+++ b/MSICALib/MSICALib.cpp
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdafx.h"
diff --git a/MSICALib/MSICALib.h b/MSICALib/MSICALib.h
index 48cf7d4..c71f270 100644
--- a/MSICALib/MSICALib.h
+++ b/MSICALib/MSICALib.h
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __MSICALib_H__
diff --git a/MSICALib/OpCert.cpp b/MSICALib/OpCert.cpp
index 9c67028..e58d994 100644
--- a/MSICALib/OpCert.cpp
+++ b/MSICALib/OpCert.cpp
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdafx.h"
diff --git a/MSICALib/OpFile.cpp b/MSICALib/OpFile.cpp
index dc094a7..de3ff1f 100644
--- a/MSICALib/OpFile.cpp
+++ b/MSICALib/OpFile.cpp
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdafx.h"
diff --git a/MSICALib/OpReg.cpp b/MSICALib/OpReg.cpp
index 7710d87..ea975ad 100644
--- a/MSICALib/OpReg.cpp
+++ b/MSICALib/OpReg.cpp
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdafx.h"
diff --git a/MSICALib/OpSvc.cpp b/MSICALib/OpSvc.cpp
index 833cba7..5c9ab3c 100644
--- a/MSICALib/OpSvc.cpp
+++ b/MSICALib/OpSvc.cpp
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdafx.h"
diff --git a/MSICALib/OpTS.cpp b/MSICALib/OpTS.cpp
index 363433b..dc6a87c 100644
--- a/MSICALib/OpTS.cpp
+++ b/MSICALib/OpTS.cpp
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdafx.h"
diff --git a/MSICALib/OpWLAN.cpp b/MSICALib/OpWLAN.cpp
index 4e0f26f..938c257 100644
--- a/MSICALib/OpWLAN.cpp
+++ b/MSICALib/OpWLAN.cpp
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdafx.h"
diff --git a/MSICALib/stdafx.cpp b/MSICALib/stdafx.cpp
index 2a7ca0c..c75333f 100644
--- a/MSICALib/stdafx.cpp
+++ b/MSICALib/stdafx.cpp
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stdafx.h"
diff --git a/MSICALib/stdafx.h b/MSICALib/stdafx.h
index 6011ea0..13b5a96 100644
--- a/MSICALib/stdafx.h
+++ b/MSICALib/stdafx.h
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/version.h b/include/version.h
index b40e6e9..45ad14a 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1,23 +1,20 @@
 /*
-    MSICA, 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 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 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,
+    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.
+    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 MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #define MSICA_VERSION        0x00ff0300