diff --git a/include/opendht.h b/include/opendht.h
index 28fef543e668b56d3db27787b3f854ede97c0b10..6f272cfce0aac62a5fedfad6e1351f5f5afeb1c3 100644
--- a/include/opendht.h
+++ b/include/opendht.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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/callbacks.h b/include/opendht/callbacks.h
index 12d9f02392f3323d842bcb80d270cfbb73d993ca..6284e70fbc5c8b0177cca2065f1b5c650b047fde 100644
--- a/include/opendht/callbacks.h
+++ b/include/opendht/callbacks.h
@@ -1,6 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/opendht/crypto.h b/include/opendht/crypto.h
index 3d4f4d52e3b802b7e8a7bf72f2b2d8d587cb194e..ee88ad0dacfc5a9379371dcc6c8bff07070960ea 100644
--- a/include/opendht/crypto.h
+++ b/include/opendht/crypto.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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 a9d959e4e1a0699f23a1f43d8d5e94e117205f6d..8fab238660d966c2fa5a61058c80495cd38de25a 100644
--- a/include/opendht/default_types.h
+++ b/include/opendht/default_types.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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 c4f1b388bf076cd31d230e0d7942cd0c0765c8c0..b8067711a3d866c7b73708f168cd9c320e843346 100644
--- a/include/opendht/dht.h
+++ b/include/opendht/dht.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/opendht/dhtrunner.h b/include/opendht/dhtrunner.h
index 86042c4058d390c98a642969adb9bcf522654ed6..896b5278490c9a38c4d575a3a32def6092b2316b 100644
--- a/include/opendht/dhtrunner.h
+++ b/include/opendht/dhtrunner.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/opendht/indexation/pht.h b/include/opendht/indexation/pht.h
index 6131b83fcbf7cda680de7999f085739fbe4ebfd5..e8363074f1d4f1ec257ddd9ebc5135aa592281cc 100644
--- a/include/opendht/indexation/pht.h
+++ b/include/opendht/indexation/pht.h
@@ -1,3 +1,23 @@
+/*
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
+ *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
+ *              Nicolas Reynaud <nicolas.reynaud@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include <string>
diff --git a/include/opendht/infohash.h b/include/opendht/infohash.h
index 33c96c843ed586164095a93791611cdd40342400..4e7e40d2c93d4ff8375a6b65ead050dcec84ef16 100644
--- a/include/opendht/infohash.h
+++ b/include/opendht/infohash.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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/log.h b/include/opendht/log.h
index 92e11c63898e2f684f7cf4e7eba8c9e7a600c3cb..c5b47bc93942b38a50e15ea2af6899d84875975f 100644
--- a/include/opendht/log.h
+++ b/include/opendht/log.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
diff --git a/include/opendht/net.h b/include/opendht/net.h
index eecbed8968f4a54702c1c9bc67c3afe594e73d0b..9d74c538aa3974ba92f7ef0e9d03e2ed58db2187 100644
--- a/include/opendht/net.h
+++ b/include/opendht/net.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/opendht/network_engine.h b/include/opendht/network_engine.h
index c15da00fae40db48c246ef924b0cca885a8d01a8..bf54b629f34c79d467050b27fa2aec12348ef458 100644
--- a/include/opendht/network_engine.h
+++ b/include/opendht/network_engine.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/opendht/node.h b/include/opendht/node.h
index 638444a5633d247b7debcd510b4e05e70384284f..826dab7ec9b26cfc61d274856257e0bcd4662492 100644
--- a/include/opendht/node.h
+++ b/include/opendht/node.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/opendht/node_cache.h b/include/opendht/node_cache.h
index 5fa582409aca46630a2531c2a9798e43f83df05b..471f5ad8b64e74aa3ed8a1c8f584d0502755864d 100644
--- a/include/opendht/node_cache.h
+++ b/include/opendht/node_cache.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/include/opendht/request.h b/include/opendht/request.h
index 4e24dc10deed64d7b72294af585e7a933d04260d..3eb3cef88b96acd1fefba4a1d14997943a85c1e0 100644
--- a/include/opendht/request.h
+++ b/include/opendht/request.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 2016 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/opendht/rng.h b/include/opendht/rng.h
index 17c464918ba681d78fc0e2ae207aac8b4692d5dd..2c51c3578feb571731807d323bc37dd9c774b1c4 100644
--- a/include/opendht/rng.h
+++ b/include/opendht/rng.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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/routing_table.h b/include/opendht/routing_table.h
index 573d8680d7a8fb56d16feff20caffbe6c27f9e0a..99f2cfe6bd6b8123b68aceaf044c4e7aad189645 100644
--- a/include/opendht/routing_table.h
+++ b/include/opendht/routing_table.h
@@ -1,6 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/opendht/scheduler.h b/include/opendht/scheduler.h
index 43e6f82ded0b9476010f99d6d92e0018b3e89464..f75ed6db2ae5f939a98cbbd8356d24f13dc6b8e7 100644
--- a/include/opendht/scheduler.h
+++ b/include/opendht/scheduler.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/opendht/securedht.h b/include/opendht/securedht.h
index 63bfcb93e76ff0b3340d470734e3ccc6a7f7a1e7..7590c513fca42627ebd7f4686d9f04df8c5f93a1 100644
--- a/include/opendht/securedht.h
+++ b/include/opendht/securedht.h
@@ -1,6 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/opendht/utils.h b/include/opendht/utils.h
index 6f830582a46605811b8420f6424d967893d81a63..32c06e7bbc9e66adb0bda0ae557b50ccb55497f2 100644
--- a/include/opendht/utils.h
+++ b/include/opendht/utils.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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 1e5c23d7b92000d491bc0bad73a3c19bb2d456af..c498a7ae14976377363da52b2117ffcb52fb8eb4 100644
--- a/include/opendht/value.h
+++ b/include/opendht/value.h
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/crypto.cpp b/src/crypto.cpp
index 6d3b5536744ce5ae50cd84113b15b63f1757e1d0..c4844efc6f587a246e11cd740545dd0553dcf196 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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 281d2068c265c281bd8aae71930a551a5c234444..df747bab664d0948061d0e5338acacc77a883091 100644
--- a/src/default_types.cpp
+++ b/src/default_types.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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 5dd3e3a62568debd0d2ecd868054704356c5c96d..4c6f7b1e2995a0ff74710dc67dcdd7e2516d2d50 100644
--- a/src/dht.cpp
+++ b/src/dht.cpp
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/dhtrunner.cpp b/src/dhtrunner.cpp
index 21f670a2c5525fb944cabfb97fc510fcbbea5013..edcbe15ed12b0144ab1f49d5180b07776034a3a2 100644
--- a/src/dhtrunner.cpp
+++ b/src/dhtrunner.cpp
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/indexation/pht.cpp b/src/indexation/pht.cpp
index 7dd35333d076a85d7b9103f786682c69b881114b..dbda88f26220339b4abab941bd397f2c60c0df05 100644
--- a/src/indexation/pht.cpp
+++ b/src/indexation/pht.cpp
@@ -1,3 +1,23 @@
+/*
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
+ *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
+ *              Nicolas Reynaud <nicolas.reynaud@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "indexation/pht.h"
 #include "rng.h"
 
diff --git a/src/infohash.cpp b/src/infohash.cpp
index 27f5be3286c68da9017caa36834a0d2758e5633a..fcc6441b7fb1592a92ad4c2035ac0b695578063c 100644
--- a/src/infohash.cpp
+++ b/src/infohash.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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/log.cpp b/src/log.cpp
index b689e9fa86db78b0eaadee0870e758ac1b5c47df..5488b3efe44235706200572bd203a76e849d2400 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
diff --git a/src/network_engine.cpp b/src/network_engine.cpp
index 761b32898df719e6bd539dc93d4fc9c4750e306e..bac57905bcb4e3a887c00a86efe656bb86cbea0b 100644
--- a/src/network_engine.cpp
+++ b/src/network_engine.cpp
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/node.cpp b/src/node.cpp
index 8a06b4469e667597784d4f7a7c8346b471b36674..6a96401f8815041eec9daadb10416aea05faa03d 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/node_cache.cpp b/src/node_cache.cpp
index 1491812e5a1239127ef02520c3b20f2450700247..3d98f2842b5c272cfa36499b19118c8a35b5c02c 100644
--- a/src/node_cache.cpp
+++ b/src/node_cache.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : 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 17d4343b59f4a394abade9ead41c914e44ec7993..146902f03703042ba374a46370b5472a5c40129e 100644
--- a/src/rng.cpp
+++ b/src/rng.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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 d229497e06f96c1ab68dbe03d233522193feb281..88d568ef1030e7c057f10e133706b9228d29743a 100644
--- a/src/securedht.cpp
+++ b/src/securedht.cpp
@@ -1,6 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/utils.cpp b/src/utils.cpp
index 3b68221c37047fb6d904836d93884e4ce3baaf4a..2520097876f51e7e7ea2ec7eea434c428774bc47 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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 576822fed84b92a7bd666b385add35408cccf271..fac0e63fc0942190f3e37a44260c457d9e73a72c 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *              Simon Désaulniers <sim.desaulniers@gmail.com>
+ *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/tools/dhtchat.cpp b/tools/dhtchat.cpp
index ece053a9980b02a62944f03013c1ae8422bd78bb..9ef045a7a81618d7b13c788d61b5c104a7f3cec6 100644
--- a/tools/dhtchat.cpp
+++ b/tools/dhtchat.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
diff --git a/tools/dhtnode.cpp b/tools/dhtnode.cpp
index 24955c0406625b92d4c8742d5575cbaf8e953b09..e2ea4709abc5cc7761e450facc7f56cc3baccdd2 100644
--- a/tools/dhtnode.cpp
+++ b/tools/dhtnode.cpp
@@ -1,7 +1,8 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *          Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/tools/dhtscanner.cpp b/tools/dhtscanner.cpp
index f7e477fbd0354a8bca9b83683236349d952827fc..1019cb40b5e2be44a61e453a429205c98e10b901 100644
--- a/tools/dhtscanner.cpp
+++ b/tools/dhtscanner.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 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 58cd5823f071383d28004d155040e616a974f199..c1801d535ce4350d57d4ce6380ecb7f063e5d98f 100644
--- a/tools/tools_common.h
+++ b/tools/tools_common.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2016 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *