diff --git a/COPYING b/COPYING
index 6b972dce..8bcbd102 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
 COPYRIGHT
 ---------
 
-Copyright (C) 1999-2015 Contributors
+Copyright (C) 1999-2016 Contributors
 
 More detailed copyright information can be found in the individual source code files.
 
diff --git a/Contrib/ExDLL/nsis_tchar.h b/Contrib/ExDLL/nsis_tchar.h
index a09a0678..a734b911 100644
--- a/Contrib/ExDLL/nsis_tchar.h
+++ b/Contrib/ExDLL/nsis_tchar.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty.
diff --git a/Contrib/InstallOptions/Readme.html b/Contrib/InstallOptions/Readme.html
index 3680014f..e1f1e315 100644
--- a/Contrib/InstallOptions/Readme.html
+++ b/Contrib/InstallOptions/Readme.html
@@ -883,7 +883,7 @@ FunctionEnd
         <pre>
 Original version Copyright &copy; 2001 Michael Bishop
 DLL version 1 Copyright &copy; 2001-2002 Nullsoft, Inc., ORTIM
-DLL version 2 Copyright &copy; 2003-2015 Amir Szekely, Joost Verburg, Dave Laundon
+DLL version 2 Copyright &copy; 2003-2016 Amir Szekely, Joost Verburg, Dave Laundon
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff --git a/Contrib/Modern UI 2/License.txt b/Contrib/Modern UI 2/License.txt
index fe21c500..2e0c2711 100644
--- a/Contrib/Modern UI 2/License.txt	
+++ b/Contrib/Modern UI 2/License.txt	
@@ -1,4 +1,4 @@
-Copyright © 2002-2015 Joost Verburg
+Copyright © 2002-2016 Joost Verburg
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
diff --git a/Contrib/Modern UI 2/MUI2.nsh b/Contrib/Modern UI 2/MUI2.nsh
index cbd36e01..4f487b44 100644
--- a/Contrib/Modern UI 2/MUI2.nsh	
+++ b/Contrib/Modern UI 2/MUI2.nsh	
@@ -1,13 +1,13 @@
 /*
 
 NSIS Modern User Interface - Version 2.0
-Copyright 2002-2015 Joost Verburg
+Copyright 2002-2016 Joost Verburg
 Contributors: Amir Szekely, Anders Kjersem
 
 */
 
 !ifndef MUI_INCLUDED
-!echo "NSIS Modern User Interface version 2.0 - Copyright 2002-2015 Joost Verburg"
+!echo "NSIS Modern User Interface version 2.0 - Copyright 2002-2016 Joost Verburg"
 
 ;--------------------------------
 !verbose push 3
diff --git a/Contrib/Modern UI 2/Readme.html b/Contrib/Modern UI 2/Readme.html
index 624ff6e6..b6bf419b 100644
--- a/Contrib/Modern UI 2/Readme.html	
+++ b/Contrib/Modern UI 2/Readme.html	
@@ -1124,7 +1124,7 @@ FunctionEnd</pre>
                             License Terms</h3>
                         <div class="toggle" id="toggle_lic">
                             <pre>
-Copyright &copy; 2002-2015 Joost Verburg
+Copyright &copy; 2002-2016 Joost Verburg
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff --git a/Contrib/Modern UI/License.txt b/Contrib/Modern UI/License.txt
index 11c0297a..bd752483 100644
--- a/Contrib/Modern UI/License.txt	
+++ b/Contrib/Modern UI/License.txt	
@@ -1,4 +1,4 @@
-Copyright 2002-2015 Joost Verburg
+Copyright 2002-2016 Joost Verburg
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html
index 5be3d7da..3d83f90f 100644
--- a/Contrib/Modern UI/Readme.html	
+++ b/Contrib/Modern UI/Readme.html	
@@ -1126,7 +1126,7 @@ FunctionEnd
                             License Terms</h3>
                         <div class="toggle" id="toggle_lic">
                             <pre>
-Copyright &copy; 2002-2015 Joost Verburg
+Copyright &copy; 2002-2016 Joost Verburg
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 1d4d5a6c..4a60b923 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -1,12 +1,12 @@
 /*
 
 NSIS Modern User Interface - Version 1.8
-Copyright 2002-2015 Joost Verburg
+Copyright 2002-2016 Joost Verburg
 
 */
 
 !ifndef MUI_INCLUDED
-!echo "NSIS Modern User Interface version 1.8 - Copyright 2002-2015 Joost Verburg"
+!echo "NSIS Modern User Interface version 1.8 - Copyright 2002-2016 Joost Verburg"
 
 ;--------------------------------
 !verbose push 3
diff --git a/Contrib/MultiUser/MultiUser.nsh b/Contrib/MultiUser/MultiUser.nsh
index daabec28..13b43441 100644
--- a/Contrib/MultiUser/MultiUser.nsh
+++ b/Contrib/MultiUser/MultiUser.nsh
@@ -4,7 +4,7 @@ MultiUser.nsh
 
 Installer configuration for multi-user Windows environments
 
-Copyright 2008-2015 Joost Verburg
+Copyright 2008-2016 Joost Verburg
 
 */
 
diff --git a/Contrib/SubStart/substart.c b/Contrib/SubStart/substart.c
index e0a15045..a8161f3c 100644
--- a/Contrib/SubStart/substart.c
+++ b/Contrib/SubStart/substart.c
@@ -2,7 +2,7 @@
  * substart.c - This app runs the executable of the same name in the 'Bin' 
  *              sub-folder and passes along the command line options.
  *
- * Copyright (c) 2013-2015 Anders Kjersem
+ * Copyright (c) 2013-2016 Anders Kjersem
  *
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Contrib/System/Source/Call-amd64.S b/Contrib/System/Source/Call-amd64.S
index 969be2ab..cb186966 100644
--- a/Contrib/System/Source/Call-amd64.S
+++ b/Contrib/System/Source/Call-amd64.S
@@ -1,7 +1,7 @@
 ;# 
 ;# This file is a part of NSIS.
 ;#
-;# Copyright (C) 2014-2015 Anders Kjersem
+;# Copyright (C) 2014-2016 Anders Kjersem
 ;#
 ;# Licensed under the zlib/libpng license (the "License");
 ;# you may not use this file except in compliance with the License.
diff --git a/Contrib/System/Source/Call.S b/Contrib/System/Source/Call.S
index a6e74a9c..4ddac5e6 100644
--- a/Contrib/System/Source/Call.S
+++ b/Contrib/System/Source/Call.S
@@ -1,5 +1,5 @@
 ;# Copyright (c) 2008 Thomas Gaugler <thomas@dadie.net>
-;# Copyright (c) 2008-2015 NSIS Contributors
+;# Copyright (c) 2008-2016 NSIS Contributors
 ;#
 ;# Permission is hereby granted, free of charge, to any person
 ;# obtaining a copy of this software and associated documentation
diff --git a/Contrib/System/System.html b/Contrib/System/System.html
index f910b7c8..565cf6f9 100644
--- a/Contrib/System/System.html
+++ b/Contrib/System/System.html
@@ -7,7 +7,7 @@
 <body>
 <h1>NSIS System Plug-in</h1>
 <p>
-<i>Copyright &copy; 2002 brainsucker (Nik Medved)</i><br><i>Copyright &copy; 2002-2015 NSIS Contributors</i>
+<i>Copyright &copy; 2002 brainsucker (Nik Medved)</i><br><i>Copyright &copy; 2002-2016 NSIS Contributors</i>
 </p>
 
 <h2>Table of Contents</h2>
diff --git a/Docs/src/config.but b/Docs/src/config.but
index 6c0e6b07..eb76e813 100644
--- a/Docs/src/config.but
+++ b/Docs/src/config.but
@@ -2,7 +2,7 @@
 \#{* Common config shared by all output formats *}
 \#{**********************************************}
 
-\define{NsisCopyright} Copyright (C) 1999-2015 Contributors
+\define{NsisCopyright} Copyright (C) 1999-2016 Contributors
 
 \copyright \NsisCopyright
 
diff --git a/Include/LangFile.nsh b/Include/LangFile.nsh
index 44596b01..d05e8b90 100644
--- a/Include/LangFile.nsh
+++ b/Include/LangFile.nsh
@@ -5,7 +5,7 @@ LangFile.nsh
 Header file to create language files that can be
 included with a single command.
 
-Copyright 2008-2015 Joost Verburg, Anders Kjersem
+Copyright 2008-2016 Joost Verburg, Anders Kjersem
 
 * Either LANGFILE_INCLUDE or LANGFILE_INCLUDE_WITHDEFAULT
   can be called from the script to include a language file.
diff --git a/Include/VB6RunTime.nsh b/Include/VB6RunTime.nsh
index 7d21fd35..0a7483cb 100644
--- a/Include/VB6RunTime.nsh
+++ b/Include/VB6RunTime.nsh
@@ -4,7 +4,7 @@ VB6RunTime.nsh
 
 Setup of Visual Basic 6.0 run-time files, including the Oleaut32.dll security update
 
-Copyright 2008-2015 Joost Verburg
+Copyright 2008-2016 Joost Verburg
 
 To obtain the run-time files, download and extract
 http://nsis.sourceforge.net/vb6runtime.zip
diff --git a/Source/7zip/7zGuids.cpp b/Source/7zip/7zGuids.cpp
index 7146d3dd..7dd6911a 100644
--- a/Source/7zip/7zGuids.cpp
+++ b/Source/7zip/7zGuids.cpp
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Common/InBuffer.cpp b/Source/7zip/7zip/Common/InBuffer.cpp
index d21698d8..f2a077c1 100644
--- a/Source/7zip/7zip/Common/InBuffer.cpp
+++ b/Source/7zip/7zip/Common/InBuffer.cpp
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Common/InBuffer.h b/Source/7zip/7zip/Common/InBuffer.h
index f860eca4..aa630c0d 100644
--- a/Source/7zip/7zip/Common/InBuffer.h
+++ b/Source/7zip/7zip/Common/InBuffer.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Common/OutBuffer.cpp b/Source/7zip/7zip/Common/OutBuffer.cpp
index 6c6e4432..700d9a3d 100644
--- a/Source/7zip/7zip/Common/OutBuffer.cpp
+++ b/Source/7zip/7zip/Common/OutBuffer.cpp
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Common/OutBuffer.h b/Source/7zip/7zip/Common/OutBuffer.h
index 88f1e35f..9c6dfe3b 100644
--- a/Source/7zip/7zip/Common/OutBuffer.h
+++ b/Source/7zip/7zip/Common/OutBuffer.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Common/StreamUtils.cpp b/Source/7zip/7zip/Common/StreamUtils.cpp
index 96bcf1b2..a97e71f0 100644
--- a/Source/7zip/7zip/Common/StreamUtils.cpp
+++ b/Source/7zip/7zip/Common/StreamUtils.cpp
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Common/StreamUtils.h b/Source/7zip/7zip/Common/StreamUtils.h
index 6e08347e..a1261bad 100644
--- a/Source/7zip/7zip/Common/StreamUtils.h
+++ b/Source/7zip/7zip/Common/StreamUtils.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h
index 19c91579..13b41fd9 100644
--- a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h
+++ b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h
index 929c2219..40f4e2b8 100644
--- a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h
+++ b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree2.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h
index 067bd640..7b318bef 100644
--- a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h
+++ b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h
index 9c6c0597..c9ee46e2 100644
--- a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h
+++ b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3Z.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h
index 4fc2f7db..04f28eb1 100644
--- a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h
+++ b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree3ZMain.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h
index e5202f44..c41a2d31 100644
--- a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h
+++ b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h
index 3aaa6144..fb899c62 100644
--- a/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h
+++ b/Source/7zip/7zip/Compress/LZ/BinTree/BinTree4b.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h b/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h
index 93d75f90..a07d93cb 100644
--- a/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h
+++ b/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMF.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h b/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h
index 1a552711..620c17c1 100644
--- a/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h
+++ b/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMFMain.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h b/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h
index 9bdbe59b..874c909a 100644
--- a/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h
+++ b/Source/7zip/7zip/Compress/LZ/BinTree/BinTreeMain.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/IMatchFinder.h b/Source/7zip/7zip/Compress/LZ/IMatchFinder.h
index fcec6a7b..19134ac0 100644
--- a/Source/7zip/7zip/Compress/LZ/IMatchFinder.h
+++ b/Source/7zip/7zip/Compress/LZ/IMatchFinder.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp b/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp
index cc9cb2bf..6e50f5b7 100644
--- a/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp
+++ b/Source/7zip/7zip/Compress/LZ/LZInWindow.cpp
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/LZInWindow.h b/Source/7zip/7zip/Compress/LZ/LZInWindow.h
index 3e35b7b7..c506067b 100644
--- a/Source/7zip/7zip/Compress/LZ/LZInWindow.h
+++ b/Source/7zip/7zip/Compress/LZ/LZInWindow.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp b/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp
index 550f5d88..6c233b24 100644
--- a/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp
+++ b/Source/7zip/7zip/Compress/LZ/LZOutWindow.cpp
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZ/LZOutWindow.h b/Source/7zip/7zip/Compress/LZ/LZOutWindow.h
index 5d8b3a00..1480c8cc 100644
--- a/Source/7zip/7zip/Compress/LZ/LZOutWindow.h
+++ b/Source/7zip/7zip/Compress/LZ/LZOutWindow.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZMA/LZMA.h b/Source/7zip/7zip/Compress/LZMA/LZMA.h
index 891219be..b3a4f217 100644
--- a/Source/7zip/7zip/Compress/LZMA/LZMA.h
+++ b/Source/7zip/7zip/Compress/LZMA/LZMA.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp b/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
index 1ed7d88e..40b1ad8d 100644
--- a/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
+++ b/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h b/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h
index 6a5181c7..0beec40c 100644
--- a/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h
+++ b/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h b/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h
index 9876c249..93d0197b 100644
--- a/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h
+++ b/Source/7zip/7zip/Compress/RangeCoder/RangeCoder.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp b/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp
index b2f20055..39be712e 100644
--- a/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp
+++ b/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h b/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h
index 04fdb6bd..f1445df4 100644
--- a/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h
+++ b/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBit.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h b/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h
index 572ff24a..8fc90feb 100644
--- a/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h
+++ b/Source/7zip/7zip/Compress/RangeCoder/RangeCoderBitTree.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h b/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h
index 0d6ac456..03176691 100644
--- a/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h
+++ b/Source/7zip/7zip/Compress/RangeCoder/RangeCoderOpt.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/ICoder.h b/Source/7zip/7zip/ICoder.h
index 4f7dac2f..b283aa6f 100644
--- a/Source/7zip/7zip/ICoder.h
+++ b/Source/7zip/7zip/ICoder.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/7zip/IStream.h b/Source/7zip/7zip/IStream.h
index 6e10efb6..264e2df7 100644
--- a/Source/7zip/7zip/IStream.h
+++ b/Source/7zip/7zip/IStream.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/Common/Alloc.cpp b/Source/7zip/Common/Alloc.cpp
index 94b5c223..c59cf73f 100644
--- a/Source/7zip/Common/Alloc.cpp
+++ b/Source/7zip/Common/Alloc.cpp
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/Common/Alloc.h b/Source/7zip/Common/Alloc.h
index 6be0fdef..a85b576a 100644
--- a/Source/7zip/Common/Alloc.h
+++ b/Source/7zip/Common/Alloc.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/Common/CRC.cpp b/Source/7zip/Common/CRC.cpp
index 8a0c3e50..87d198ac 100644
--- a/Source/7zip/Common/CRC.cpp
+++ b/Source/7zip/Common/CRC.cpp
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/Common/CRC.h b/Source/7zip/Common/CRC.h
index f87232bb..0f3fb4a6 100644
--- a/Source/7zip/Common/CRC.h
+++ b/Source/7zip/Common/CRC.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/Common/Defs.h b/Source/7zip/Common/Defs.h
index 6d6fcd41..4f05f680 100644
--- a/Source/7zip/Common/Defs.h
+++ b/Source/7zip/Common/Defs.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/Common/MyCom.h b/Source/7zip/Common/MyCom.h
index 159e43bc..3b75acf8 100644
--- a/Source/7zip/Common/MyCom.h
+++ b/Source/7zip/Common/MyCom.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/Common/MyGuidDef.h b/Source/7zip/Common/MyGuidDef.h
index 47637a24..f38d54ca 100644
--- a/Source/7zip/Common/MyGuidDef.h
+++ b/Source/7zip/Common/MyGuidDef.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/Common/MyUnknown.h b/Source/7zip/Common/MyUnknown.h
index 3a609915..3ac1e12c 100644
--- a/Source/7zip/Common/MyUnknown.h
+++ b/Source/7zip/Common/MyUnknown.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/Common/MyWindows.h b/Source/7zip/Common/MyWindows.h
index 569e57d5..2bc67600 100644
--- a/Source/7zip/Common/MyWindows.h
+++ b/Source/7zip/Common/MyWindows.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/Common/StdAfx.h b/Source/7zip/Common/StdAfx.h
index ae965063..a38a6cc2 100644
--- a/Source/7zip/Common/StdAfx.h
+++ b/Source/7zip/Common/StdAfx.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/Common/Types.h b/Source/7zip/Common/Types.h
index 6272128e..3e2e5487 100644
--- a/Source/7zip/Common/Types.h
+++ b/Source/7zip/Common/Types.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/LZMADecode.c b/Source/7zip/LZMADecode.c
index 130c9bf2..9106f01c 100644
--- a/Source/7zip/LZMADecode.c
+++ b/Source/7zip/LZMADecode.c
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/7zip/LZMADecode.h b/Source/7zip/LZMADecode.h
index c4fcd747..7bdaad67 100644
--- a/Source/7zip/LZMADecode.h
+++ b/Source/7zip/LZMADecode.h
@@ -4,7 +4,7 @@
  * This file is a part of LZMA compression module for NSIS.
  * 
  * Original LZMA SDK Copyright (C) 1999-2006 Igor Pavlov
- * Modifications Copyright (C) 2003-2015 Amir Szekely <kichik@netvision.net.il>
+ * Modifications Copyright (C) 2003-2016 Amir Szekely <kichik@netvision.net.il>
  * 
  * Licensed under the Common Public License version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/DialogTemplate.cpp b/Source/DialogTemplate.cpp
index 8f008141..1b982555 100644
--- a/Source/DialogTemplate.cpp
+++ b/Source/DialogTemplate.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2015 Amir Szekely <kichik@netvision.net.il> and Contributors
+ * Copyright (C) 2002-2016 Amir Szekely <kichik@netvision.net.il> and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/DialogTemplate.h b/Source/DialogTemplate.h
index b15ae38d..72774e15 100644
--- a/Source/DialogTemplate.h
+++ b/Source/DialogTemplate.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2015 Amir Szekely <kichik@netvision.net.il> and Contributors
+ * Copyright (C) 2002-2016 Amir Szekely <kichik@netvision.net.il> and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/Platform.h b/Source/Platform.h
index aea5a208..aa85d50f 100644
--- a/Source/Platform.h
+++ b/Source/Platform.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/Plugins.cpp b/Source/Plugins.cpp
index 1d9430d1..dc95ccd2 100644
--- a/Source/Plugins.cpp
+++ b/Source/Plugins.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/Plugins.h b/Source/Plugins.h
index 537b1513..b3f7ec4d 100644
--- a/Source/Plugins.h
+++ b/Source/Plugins.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/ResourceEditor.cpp b/Source/ResourceEditor.cpp
index 417dc3d7..84a2630b 100644
--- a/Source/ResourceEditor.cpp
+++ b/Source/ResourceEditor.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2015 Amir Szekely <kichik@users.sourceforge.net>
+ * Copyright (C) 2002-2016 Amir Szekely <kichik@users.sourceforge.net>
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/ResourceEditor.h b/Source/ResourceEditor.h
index a6e1aa4f..f05435fd 100644
--- a/Source/ResourceEditor.h
+++ b/Source/ResourceEditor.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2002-2015 Amir Szekely <kichik@users.sourceforge.net>
+ * Copyright (C) 2002-2016 Amir Szekely <kichik@users.sourceforge.net>
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/ResourceVersionInfo.cpp b/Source/ResourceVersionInfo.cpp
index 16aa0fe6..682acdf3 100644
--- a/Source/ResourceVersionInfo.cpp
+++ b/Source/ResourceVersionInfo.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/ResourceVersionInfo.h b/Source/ResourceVersionInfo.h
index 05561177..1ba860b0 100644
--- a/Source/ResourceVersionInfo.h
+++ b/Source/ResourceVersionInfo.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/ShConstants.cpp b/Source/ShConstants.cpp
index 1709cbd7..e8939599 100644
--- a/Source/ShConstants.cpp
+++ b/Source/ShConstants.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/ShConstants.h b/Source/ShConstants.h
index dd62914a..999a1a22 100644
--- a/Source/ShConstants.h
+++ b/Source/ShConstants.h
@@ -4,7 +4,7 @@
  * This file is a part of NSIS.
  * 
  * Copyright (C) 2003 Ramon
- * Copyright (C) 2003-2015 NSIS Contributors
+ * Copyright (C) 2003-2016 NSIS Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/afxres.h b/Source/afxres.h
index 5808766b..efa045b0 100644
--- a/Source/afxres.h
+++ b/Source/afxres.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/build.cpp b/Source/build.cpp
index 419a1786..933ba7e6 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/build.h b/Source/build.h
index 7d260f69..f4a50d4c 100644
--- a/Source/build.h
+++ b/Source/build.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/bzip2/blocksort.c b/Source/bzip2/blocksort.c
index bebdee1c..fef6a94a 100644
--- a/Source/bzip2/blocksort.c
+++ b/Source/bzip2/blocksort.c
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff --git a/Source/bzip2/bzlib.c b/Source/bzip2/bzlib.c
index a4ab8df7..c0112d18 100644
--- a/Source/bzip2/bzlib.c
+++ b/Source/bzip2/bzlib.c
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff --git a/Source/bzip2/bzlib.h b/Source/bzip2/bzlib.h
index e989adfd..d42ceacd 100644
--- a/Source/bzip2/bzlib.h
+++ b/Source/bzip2/bzlib.h
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff --git a/Source/bzip2/compress.c b/Source/bzip2/compress.c
index 3b9cb881..8bbce9d4 100644
--- a/Source/bzip2/compress.c
+++ b/Source/bzip2/compress.c
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff --git a/Source/bzip2/decompress.c b/Source/bzip2/decompress.c
index 33c890a8..868ed43d 100644
--- a/Source/bzip2/decompress.c
+++ b/Source/bzip2/decompress.c
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff --git a/Source/bzip2/huffman.c b/Source/bzip2/huffman.c
index 3cbe4fc0..2b6a2f41 100644
--- a/Source/bzip2/huffman.c
+++ b/Source/bzip2/huffman.c
@@ -2,7 +2,7 @@
  * This file is a part of the bzip2 compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.bzip.org/
diff --git a/Source/cbzip2.h b/Source/cbzip2.h
index ee6cefe4..b3c59989 100644
--- a/Source/cbzip2.h
+++ b/Source/cbzip2.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/clzma.cpp b/Source/clzma.cpp
index ae7091c7..c3f5c0ff 100644
--- a/Source/clzma.cpp
+++ b/Source/clzma.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/clzma.h b/Source/clzma.h
index 92723d73..5007bbd7 100644
--- a/Source/clzma.h
+++ b/Source/clzma.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/compressor.h b/Source/compressor.h
index 04895490..029ed617 100644
--- a/Source/compressor.h
+++ b/Source/compressor.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/crc32.c b/Source/crc32.c
index 6abb952c..5a468f0d 100644
--- a/Source/crc32.c
+++ b/Source/crc32.c
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/crc32.h b/Source/crc32.h
index 9bb506f2..6e7d2a72 100644
--- a/Source/crc32.h
+++ b/Source/crc32.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/czlib.h b/Source/czlib.h
index 5f24f068..306e0229 100644
--- a/Source/czlib.h
+++ b/Source/czlib.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/dirreader.cpp b/Source/dirreader.cpp
index 60848dc0..523ddfc0 100644
--- a/Source/dirreader.cpp
+++ b/Source/dirreader.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +12,6 @@
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty.
- *
- * Unicode support by Jim Park -- 08/23/2007
  */
 
 #include "Platform.h"
diff --git a/Source/dirreader.h b/Source/dirreader.h
index 2d3176ab..f028dd9e 100644
--- a/Source/dirreader.h
+++ b/Source/dirreader.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c
index 57e3cfa9..3e6f76cd 100644
--- a/Source/exehead/Main.c
+++ b/Source/exehead/Main.c
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +12,6 @@
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty.
- *
- * Unicode support by Jim Park -- 08/22/2007
  */
 
 #include "../Platform.h"
diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c
index ccdcdbdd..16627d40 100644
--- a/Source/exehead/Ui.c
+++ b/Source/exehead/Ui.c
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft, Jeff Doozan and Contributors
+ * Copyright (C) 1999-2016 Nullsoft, Jeff Doozan and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/afxres.h b/Source/exehead/afxres.h
index 0aa13411..738cf5c0 100644
--- a/Source/exehead/afxres.h
+++ b/Source/exehead/afxres.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/api.h b/Source/exehead/api.h
index 2289296f..cb243603 100644
--- a/Source/exehead/api.h
+++ b/Source/exehead/api.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/bgbg.c b/Source/exehead/bgbg.c
index c7eac28a..852db7fc 100644
--- a/Source/exehead/bgbg.c
+++ b/Source/exehead/bgbg.c
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/components.c b/Source/exehead/components.c
index ef9da185..bdbcb91a 100644
--- a/Source/exehead/components.c
+++ b/Source/exehead/components.c
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/components.h b/Source/exehead/components.h
index 95c3633b..33cb3ef0 100644
--- a/Source/exehead/components.h
+++ b/Source/exehead/components.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/config.h b/Source/exehead/config.h
index 347ec763..1f4303d3 100644
--- a/Source/exehead/config.h
+++ b/Source/exehead/config.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/exec.c b/Source/exehead/exec.c
index 052c4501..a30e345a 100644
--- a/Source/exehead/exec.c
+++ b/Source/exehead/exec.c
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/exec.h b/Source/exehead/exec.h
index 50e61450..59aa6f24 100644
--- a/Source/exehead/exec.h
+++ b/Source/exehead/exec.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/fileform.c b/Source/exehead/fileform.c
index 2f3b0bc6..387ea1e9 100644
--- a/Source/exehead/fileform.c
+++ b/Source/exehead/fileform.c
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/fileform.h b/Source/exehead/fileform.h
index 53cb07b5..96acc397 100644
--- a/Source/exehead/fileform.h
+++ b/Source/exehead/fileform.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/lang.h b/Source/exehead/lang.h
index 6f8c410a..8a009686 100644
--- a/Source/exehead/lang.h
+++ b/Source/exehead/lang.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/plugin.c b/Source/exehead/plugin.c
index d5f5bef6..a514dd2e 100644
--- a/Source/exehead/plugin.c
+++ b/Source/exehead/plugin.c
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/plugin.h b/Source/exehead/plugin.h
index 9e0c1445..403dae44 100644
--- a/Source/exehead/plugin.h
+++ b/Source/exehead/plugin.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/state.h b/Source/exehead/state.h
index afd002a8..0b72d590 100644
--- a/Source/exehead/state.h
+++ b/Source/exehead/state.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/ui.h b/Source/exehead/ui.h
index d148d1c0..8f884b90 100644
--- a/Source/exehead/ui.h
+++ b/Source/exehead/ui.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/util.c b/Source/exehead/util.c
index 66639019..14503c92 100644
--- a/Source/exehead/util.c
+++ b/Source/exehead/util.c
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/exehead/util.h b/Source/exehead/util.h
index e09898fb..dca2b47f 100644
--- a/Source/exehead/util.h
+++ b/Source/exehead/util.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/fileform.cpp b/Source/fileform.cpp
index 49498160..f1779f03 100644
--- a/Source/fileform.cpp
+++ b/Source/fileform.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +12,6 @@
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty.
- *
- * Unicode support by Jim Park -- 08/13/2007
  */
 
 #include "fileform.h"
diff --git a/Source/fileform.h b/Source/fileform.h
index 288dcc4b..443b5c4f 100644
--- a/Source/fileform.h
+++ b/Source/fileform.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/growbuf.cpp b/Source/growbuf.cpp
index b2edb50c..7b90f1c0 100644
--- a/Source/growbuf.cpp
+++ b/Source/growbuf.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/growbuf.h b/Source/growbuf.h
index 2106dfe1..e3a57e06 100644
--- a/Source/growbuf.h
+++ b/Source/growbuf.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/icon.cpp b/Source/icon.cpp
index 40cdc409..d875c551 100644
--- a/Source/icon.cpp
+++ b/Source/icon.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/icon.h b/Source/icon.h
index 1de0dd01..ac7a5e6a 100644
--- a/Source/icon.h
+++ b/Source/icon.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/lang.cpp b/Source/lang.cpp
index 94c0adc1..00e24c05 100644
--- a/Source/lang.cpp
+++ b/Source/lang.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/lang.h b/Source/lang.h
index 31efe37a..f419729f 100644
--- a/Source/lang.h
+++ b/Source/lang.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/lineparse.cpp b/Source/lineparse.cpp
index e9527dbf..62311e41 100644
--- a/Source/lineparse.cpp
+++ b/Source/lineparse.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +12,6 @@
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty.
- *
- * Unicode support by Jim Park -- 08/09/2007
  */
 
 #include "lineparse.h"
diff --git a/Source/lineparse.h b/Source/lineparse.h
index b5e9fabb..8df1738d 100644
--- a/Source/lineparse.h
+++ b/Source/lineparse.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/makenssi.cpp b/Source/makenssi.cpp
index 3a51df45..71472c10 100644
--- a/Source/makenssi.cpp
+++ b/Source/makenssi.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 #include "winchar.h" // assert(sizeof(WINWCHAR)...)
 
 #include <nsis-version.h>
-#define NSIS_COPYYEARS _T("1999-2015")
+#define NSIS_COPYYEARS _T("1999-2016")
 
 using namespace std;
 
diff --git a/Source/manifest.cpp b/Source/manifest.cpp
index 9b89c418..c2a0b514 100644
--- a/Source/manifest.cpp
+++ b/Source/manifest.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/manifest.h b/Source/manifest.h
index 7a3e4c17..d96df4b7 100644
--- a/Source/manifest.h
+++ b/Source/manifest.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/mmap.cpp b/Source/mmap.cpp
index a01be3c7..0947802a 100644
--- a/Source/mmap.cpp
+++ b/Source/mmap.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/mmap.h b/Source/mmap.h
index c3192e92..904b8e9f 100644
--- a/Source/mmap.h
+++ b/Source/mmap.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/script.cpp b/Source/script.cpp
index d539231b..bb6ca531 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/strlist.cpp b/Source/strlist.cpp
index f9af75d0..d4edb69d 100644
--- a/Source/strlist.cpp
+++ b/Source/strlist.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/strlist.h b/Source/strlist.h
index 530327da..9df66aeb 100644
--- a/Source/strlist.h
+++ b/Source/strlist.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/tchar.h b/Source/tchar.h
index 8fa7b477..925ccacc 100644
--- a/Source/tchar.h
+++ b/Source/tchar.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty.
diff --git a/Source/tokens.cpp b/Source/tokens.cpp
index db3cd01b..ec9dbdd4 100644
--- a/Source/tokens.cpp
+++ b/Source/tokens.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/tokens.h b/Source/tokens.h
index fe93b20b..533b07b0 100644
--- a/Source/tokens.h
+++ b/Source/tokens.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/tstring.cpp b/Source/tstring.cpp
index 9aa5e4a5..eb751a23 100644
--- a/Source/tstring.cpp
+++ b/Source/tstring.cpp
@@ -2,7 +2,7 @@
 //
 // This file is a part of Unicode NSIS.
 //
-// Copyright (C) 2007-2015 Jim Park
+// Copyright (C) 2007-2016 Jim Park
 //
 // Licensed under the zlib/libpng license (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/Source/tstring.h b/Source/tstring.h
index 3c02d555..655e6dea 100644
--- a/Source/tstring.h
+++ b/Source/tstring.h
@@ -2,7 +2,7 @@
 //
 // This file is a part of Unicode NSIS.
 //
-// Copyright (C) 2007-2015 Jim Park
+// Copyright (C) 2007-2016 Jim Park
 //
 // Licensed under the zlib/libpng license (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/Source/uservars.h b/Source/uservars.h
index 1e611036..f7dd3231 100644
--- a/Source/uservars.h
+++ b/Source/uservars.h
@@ -4,7 +4,7 @@
  * This file is a part of NSIS.
  * 
  * Copyright (C) 2003 Ramon
- * Copyright (C) 2003-2015 NSIS Contributors
+ * Copyright (C) 2003-2016 NSIS Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/utf.cpp b/Source/utf.cpp
index 4c0fd83e..0de53977 100644
--- a/Source/utf.cpp
+++ b/Source/utf.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2011-2015 Anders Kjersem
+ * Copyright (C) 2011-2016 Anders Kjersem
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/utf.h b/Source/utf.h
index 1efb36d8..772f440a 100644
--- a/Source/utf.h
+++ b/Source/utf.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 2011-2015 Anders Kjersem
+ * Copyright (C) 2011-2016 Anders Kjersem
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/util.cpp b/Source/util.cpp
index b8bc14c2..85c85137 100644
--- a/Source/util.cpp
+++ b/Source/util.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,6 @@
  * warranty.
  */
 
-/* Unicode support by Jim Park -- 07/23/2007 */
-
 #include "Platform.h"
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/Source/util.h b/Source/util.h
index 32fe9c12..ef24374c 100644
--- a/Source/util.h
+++ b/Source/util.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/validateunicode.cpp b/Source/validateunicode.cpp
index 312947b0..0218ddd4 100644
--- a/Source/validateunicode.cpp
+++ b/Source/validateunicode.cpp
@@ -2,7 +2,7 @@
 //
 // This file is a part of Unicode NSIS.
 //
-// Copyright (C) 2009-2015 Jim Park
+// Copyright (C) 2009-2016 Jim Park
 //
 // Licensed under the zlib/libpng license (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/Source/validateunicode.h b/Source/validateunicode.h
index 35cf4b16..8b39b1ee 100644
--- a/Source/validateunicode.h
+++ b/Source/validateunicode.h
@@ -2,7 +2,7 @@
 //
 // This file is a part of Unicode NSIS.
 //
-// Copyright (C) 2009-2015 Jim Park
+// Copyright (C) 2009-2016 Jim Park
 //
 // Licensed under the zlib/libpng license (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/Source/winchar.cpp b/Source/winchar.cpp
index 8f51d34d..0e11c6f3 100644
--- a/Source/winchar.cpp
+++ b/Source/winchar.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/winchar.h b/Source/winchar.h
index dcbd69a9..78c43cfa 100644
--- a/Source/winchar.h
+++ b/Source/winchar.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/writer.cpp b/Source/writer.cpp
index dfa55804..96ec9b10 100644
--- a/Source/writer.cpp
+++ b/Source/writer.cpp
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/writer.h b/Source/writer.h
index 4d961dfe..2bc1317b 100644
--- a/Source/writer.h
+++ b/Source/writer.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Source/zlib/INFBLOCK.C b/Source/zlib/INFBLOCK.C
index 1f620bc5..12603f42 100644
--- a/Source/zlib/INFBLOCK.C
+++ b/Source/zlib/INFBLOCK.C
@@ -2,7 +2,7 @@
  * This file is a part of the zlib compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.zlib.net/
diff --git a/Source/zlib/ZCONF.H b/Source/zlib/ZCONF.H
index 8f56a364..20783308 100644
--- a/Source/zlib/ZCONF.H
+++ b/Source/zlib/ZCONF.H
@@ -2,7 +2,7 @@
  * This file is a part of the zlib compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.zlib.net/
diff --git a/Source/zlib/ZLIB.H b/Source/zlib/ZLIB.H
index 7237d4fb..7978c63e 100644
--- a/Source/zlib/ZLIB.H
+++ b/Source/zlib/ZLIB.H
@@ -2,7 +2,7 @@
  * This file is a part of the zlib compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.zlib.net/
diff --git a/Source/zlib/ZUTIL.H b/Source/zlib/ZUTIL.H
index 97fcf866..895c255c 100644
--- a/Source/zlib/ZUTIL.H
+++ b/Source/zlib/ZUTIL.H
@@ -2,7 +2,7 @@
  * This file is a part of the zlib compression module for NSIS.
  * 
  * Copyright and license information can be found below.
- * Modifications Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Modifications Copyright (C) 1999-2016 Nullsoft and Contributors
  * 
  * The original zlib source code is available at
  * http://www.zlib.net/