diff --git a/README.md b/README.md
index b19ee3172ace1920b7c39193e71af6ddbf90d576..aa5a32ecfb33c4cca05d2412bc071923102d7f24 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ for r in results:
Licence
-
-Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+Copyright (C) 2014-2016 Savoir-faire Linux Inc.
Licenced under the GNU General Public License version 3, though the core routing library (dht.cpp) is licenced under the MIT licence.
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 11c83b28bb10794caf54db2d6cbdb97825cd27ba..19dfa98ba9ca9c31d272ad673fed70f173b38af7 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -353,7 +353,7 @@ DOCSET_PUBLISHER_ID = com.savoirfairelinux
# The default value is: Publisher.
# This tag requires that the tag GENERATE_DOCSET is set to YES.
-DOCSET_PUBLISHER_NAME = Savoir-Faire Linux
+DOCSET_PUBLISHER_NAME = Savoir-faire Linux
# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
diff --git a/include/opendht.h b/include/opendht.h
index a5dafeb26366c35d0bf90daa6df7212ff71be1ad..29fab07990a874380debac18b741e65c374f29ee 100644
--- a/include/opendht.h
+++ b/include/opendht.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/include/opendht/crypto.h b/include/opendht/crypto.h
index 8a2f3f4a85ec3748baee6e7394fdb8e829a3da4e..8642e5132d42d353fcd40b0b62a1f49b30ddf00f 100644
--- a/include/opendht/crypto.h
+++ b/include/opendht/crypto.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/include/opendht/default_types.h b/include/opendht/default_types.h
index 04fb03610b51675d32b8f08d3431980a5bb0c0f4..5f110abddee3096c16ffffa52a7edf6226b2425a 100644
--- a/include/opendht/default_types.h
+++ b/include/opendht/default_types.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/include/opendht/dht.h b/include/opendht/dht.h
index 1770be360a72208e1315db3c3511da92f508294d..d11b5b895e4f56a815dcf9a6fad6cf3a18791526 100644
--- a/include/opendht/dht.h
+++ b/include/opendht/dht.h
@@ -1,6 +1,6 @@
/*
-Copyright (c) 2009-2014 Juliusz Chroboczek
-Copyright (c) 2014-2015 Savoir-faire Linux Inc.
+Copyright (C) 2009-2014 Juliusz Chroboczek
+Copyright (C) 2014-2016 Savoir-faire Linux Inc.
Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>,
Juliusz Chroboczek <jch@pps.univ–paris–diderot.fr>
diff --git a/include/opendht/dhtrunner.h b/include/opendht/dhtrunner.h
index 6d55aecc12472cf07c8168de237e31303b0785f1..4ca5fa39ccaf2caf2f314f54d5e96d593f1f97c5 100644
--- a/include/opendht/dhtrunner.h
+++ b/include/opendht/dhtrunner.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
* Simon Désaulniers <sim.desaulniers@gmail.com>
*
diff --git a/include/opendht/infohash.h b/include/opendht/infohash.h
index 75a4552b637c5a97b565ba50204c3a32163d9360..e4b353ecafa359946af76ccd70680e46a09ff6a6 100644
--- a/include/opendht/infohash.h
+++ b/include/opendht/infohash.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/include/opendht/rng.h b/include/opendht/rng.h
index 8a940f0acb1b9a517989972c31463c4e5ec09c15..8b43430545c645498c6fea2d79457d7a95c1a5a6 100644
--- a/include/opendht/rng.h
+++ b/include/opendht/rng.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/include/opendht/securedht.h b/include/opendht/securedht.h
index 35c911032c1c4ddbf57c57cd14ceba4d8f61914a..fe2e47c4c92156db5bf00f6fcef8c66579c4d93b 100644
--- a/include/opendht/securedht.h
+++ b/include/opendht/securedht.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/include/opendht/utils.h b/include/opendht/utils.h
index c6ce5a993857b159b5dc8a83a9c4f4bd41918813..f1314c2a99e240c92e64094b7b81f52be6586ab0 100644
--- a/include/opendht/utils.h
+++ b/include/opendht/utils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/include/opendht/value.h b/include/opendht/value.h
index 693014bc268f82d1cbdc1782ea4b9ede12d44169..4b9336e284e651a80bb5a3e18b2a7ae27f5dd33c 100644
--- a/include/opendht/value.h
+++ b/include/opendht/value.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
* Simon Désaulniers <sim.desaulniers@gmail.com>
*
diff --git a/python/opendht.pyx b/python/opendht.pyx
index a7a68c7f2a85351fafe58500673cee98093b96d5..408f1b9057dafc0a99aa4a795fae2483a80d3380 100644
--- a/python/opendht.pyx
+++ b/python/opendht.pyx
@@ -5,7 +5,7 @@
# distutils: libraries = opendht gnutls
# cython: language_level=3
#
-# Copyright (c) 2015 Savoir-Faire Linux Inc.
+# Copyright (c) 2015-2016 Savoir-faire Linux Inc.
# Author(s): Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
# Adrien Béraud <adrien.beraud@savoirfairelinux.com>
# Simon Désaulniers <sim.desaulniers@gmail.com>
diff --git a/python/opendht_cpp.pxd b/python/opendht_cpp.pxd
index 3e844ca319b8732c8d6d1f60b6600a3a20dd4382..be718b8a4a24dd840db43f699ad3c47ba2f02f70 100644
--- a/python/opendht_cpp.pxd
+++ b/python/opendht_cpp.pxd
@@ -1,4 +1,4 @@
-# Copyright (C) 2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
# Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
# Simon Désaulniers <sim.desaulniers@gmail.com>
diff --git a/python/setup.py.in b/python/setup.py.in
index 943bd645c4e980c8f4332da2dfd4d5c777fc8f4f..c4654d3ed1bba17636e7b29968650dc1a6f04a61 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
# Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
# Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
#
diff --git a/python/tools/benchmark.py b/python/tools/benchmark.py
index 3c6c02c35856d8c13ad5b5df57a17e2b876acff5..a6a7dd92c436cc5551f08b78eb56867d9beead35 100755
--- a/python/tools/benchmark.py
+++ b/python/tools/benchmark.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# Copyright (C) 2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
# Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
# Simon Désaulniers <sim.desaulniers@gmail.com>
diff --git a/python/tools/dhtnetwork.py b/python/tools/dhtnetwork.py
index f845b805ea75f11c4ecc1f7231e31bcdd57e3d77..bfa225d00da12085ebd976648e98907d8dd9ab5e 100755
--- a/python/tools/dhtnetwork.py
+++ b/python/tools/dhtnetwork.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# Copyright (C) 2015 Savoir-Faire Linux Inc.
+# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
# Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
# Simon Désaulniers <sim.desaulniers@gmail.com>
diff --git a/python/tools/scanner.py b/python/tools/scanner.py
index 43ea753b4c9fc4b964fa0244c618b8bb855ebc06..c8a98d6877bed5335dbd84be2c6309e56d94ed68 100755
--- a/python/tools/scanner.py
+++ b/python/tools/scanner.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# Copyright (c) 2015 Savoir-Faire Linux Inc.
+# Copyright (c) 2015-2016 Savoir-faire Linux Inc.
# Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/python/tools/virtual_network_builder.py b/python/tools/virtual_network_builder.py
index 42e4471e31b913e10e61d96668cc35436941407f..be0e9a98b4b7df3861d30b290189edd20836f785 100755
--- a/python/tools/virtual_network_builder.py
+++ b/python/tools/virtual_network_builder.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# Copyright (C) 2015 Savoir-Faire Linux Inc.
+# Copyright (c) 2015-2016 Savoir-faire Linux Inc.
# Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
import argparse, subprocess
diff --git a/src/crypto.cpp b/src/crypto.cpp
index b1fb77e8178b278f014a3f280499e2e8d0c98faa..a253dae1021fa8a2f1a566a0baa1efaea12d867e 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/default_types.cpp b/src/default_types.cpp
index c73406daf12cb26e34ef4ac141612d1b1c92080f..6d1aa5af1f916750d87b0573fbbc0a04b848520d 100644
--- a/src/default_types.cpp
+++ b/src/default_types.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/dht.cpp b/src/dht.cpp
index 7e32cf2a906efdd33903cd52acd3ae68404b60ef..b5ded203ff849de19a9406df3f38bde5f20fb7a1 100644
--- a/src/dht.cpp
+++ b/src/dht.cpp
@@ -1,6 +1,6 @@
/*
-Copyright (c) 2009-2014 Juliusz Chroboczek
-Copyright (c) 2014-2015 Savoir-faire Linux Inc.
+Copyright (C) 2009-2014 Juliusz Chroboczek
+Copyright (C) 2014-2016 Savoir-faire Linux Inc.
Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>,
Juliusz Chroboczek <jch@pps.univ–paris–diderot.fr>
diff --git a/src/dhtrunner.cpp b/src/dhtrunner.cpp
index 03c0f4caa4c0ede58352c2f2fa7a0c4b31f401dc..108caa5f990db6da20ff031938b10935c790767b 100644
--- a/src/dhtrunner.cpp
+++ b/src/dhtrunner.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
* Simon Désaulniers <sim.desaulniers@gmail.com>
*
diff --git a/src/infohash.cpp b/src/infohash.cpp
index c00a2e551b2c2602abfc8152e0c64fcbe277f0b1..8f121642947cb09ee8c06c138bb47309c5ad3b32 100644
--- a/src/infohash.cpp
+++ b/src/infohash.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/rng.cpp b/src/rng.cpp
index 3dddede84c92511fa4ab3421bc0d0fbc836f5a5e..17d4343b59f4a394abade9ead41c914e44ec7993 100644
--- a/src/rng.cpp
+++ b/src/rng.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/securedht.cpp b/src/securedht.cpp
index d646975780822c8b3dcd6bc9a0d4f7b2197d29dd..d61275cbbb6ea94f651412a913484084e01d8fb9 100644
--- a/src/securedht.cpp
+++ b/src/securedht.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/utils.cpp b/src/utils.cpp
index a9a67a4c5671b5b50cd44eda6fb0459885cc1d1a..d49b34aa21f3d9bf8bb84dea53d324a2abfa3711 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/value.cpp b/src/value.cpp
index 1aa36be07ab0a1085d161d84f318fd96e957dd8d..d15e01209e582d5b9037ee2ecda6cdd22e273094 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
* Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
* Simon Désaulniers <sim.desaulniers@gmail.com>
*
diff --git a/tools/dhtchat.cpp b/tools/dhtchat.cpp
index d23603d734b0852156a9b081c5ac8027aff0c696..f0b4c4455e76c3dde5f5a08c49cb7399fd4d4363 100644
--- a/tools/dhtchat.cpp
+++ b/tools/dhtchat.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
diff --git a/tools/dhtnode.cpp b/tools/dhtnode.cpp
index 097a8f05cb21f78d6d810de2b6f88f7194997502..092bbd6bc51c6aba194941e1e56df687c4211588 100644
--- a/tools/dhtnode.cpp
+++ b/tools/dhtnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
diff --git a/tools/dhtscanner.cpp b/tools/dhtscanner.cpp
index 507711c9d7757c5f04c12af95542d792b3668765..63a1f10809780296fe6fe07a79b92b72fda27837 100644
--- a/tools/dhtscanner.cpp
+++ b/tools/dhtscanner.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
diff --git a/tools/tools_common.h b/tools/tools_common.h
index c8fcab4115f23f2926b7eaa2c9b83ab5ce809b2c..80427292b69c865795040e6ee9ad87efeb6c0490 100644
--- a/tools/tools_common.h
+++ b/tools/tools_common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
+ * Copyright (C) 2014-2016 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*