diff --git a/include/opendht.h b/include/opendht.h
index c6f8a1b3efd86e21c3e025887a2de08d33d60f5a..a5dafeb26366c35d0bf90daa6df7212ff71be1ad 100644
--- a/include/opendht.h
+++ b/include/opendht.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2014-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #pragma once
diff --git a/include/opendht/crypto.h b/include/opendht/crypto.h
index 16990f9ce7e3a95961906833cdde6955af5cf072..8a2f3f4a85ec3748baee6e7394fdb8e829a3da4e 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-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #pragma once
diff --git a/include/opendht/default_types.h b/include/opendht/default_types.h
index c6d8907c4bdb89edcf4e4ee6666f98442781cbff..0b32dc604fd17c2298cb4e1d0d1f80b4c0147bdb 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-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #pragma once
diff --git a/include/opendht/dht.h b/include/opendht/dht.h
index 77af07f9f1e5b667248f653ad122d431796841d1..373b0c3bca07b4a0a3ed14568579495f6c0bf771 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) 2014-2015 Savoir-faire Linux Inc.
 
 Authors : 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 22b08fee80e8d1e1eccf459f3a72df2e2a9f15d1..11c49789cef4c0193d8229b4be5fb0bc38c5fd00 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-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #pragma once
diff --git a/include/opendht/infohash.h b/include/opendht/infohash.h
index 01a2c306dbad8fc9b8556f17681f6bf9cb61808f..75a4552b637c5a97b565ba50204c3a32163d9360 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-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #pragma once
diff --git a/include/opendht/rng.h b/include/opendht/rng.h
index 63e347f0c5cd4826d1fd2ca509dae0b266cdc6c4..d3c8118d5135d6d6500290dea9fd23974e40c536 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-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include <random>
diff --git a/include/opendht/securedht.h b/include/opendht/securedht.h
index 20e48666725c25ec66e9aabf28127ffe2f897547..35c911032c1c4ddbf57c57cd14ceba4d8f61914a 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-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
  *  If you modify this program, or any covered work, by linking or
  *  combining it with the OpenSSL project's OpenSSL library (or a
  *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ *  terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
  *  grants you additional permission to convey the resulting work.
  *  Corresponding Source for a non-source form of such a combination
  *  shall include the source code for the parts of OpenSSL used as well
diff --git a/include/opendht/value.h b/include/opendht/value.h
index b79f8b349792bc615b536ab429ec30fd256b6e5f..6423ca1dc08b4e0208e317c794755068a0f3b95b 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-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #pragma once
diff --git a/src/crypto.cpp b/src/crypto.cpp
index ca836e8c030598b9108210702e708d1309150f26..b1fb77e8178b278f014a3f280499e2e8d0c98faa 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2014-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include "crypto.h"
diff --git a/src/default_types.cpp b/src/default_types.cpp
index ebe57b1bea3bd9170bde4731e2d4d5155edc9be6..86ff073c3244c59f07441bc777f8a7edeb2425d9 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-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include "default_types.h"
diff --git a/src/dht.cpp b/src/dht.cpp
index 17276b3eacdb0d744a666ae92ff0cad94fe174d8..93c05348deab0718e7bfc21c7f0ce9e1bd9c26f6 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) 2014-2015 Savoir-faire Linux Inc.
 
 Authors : 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 0822d241fe276d9380f46530a8a6ae1c6764f36e..b5766d4a5b2cb7d67d20040743e5c580d86728c5 100644
--- a/src/dhtrunner.cpp
+++ b/src/dhtrunner.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2014-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include "dhtrunner.h"
diff --git a/src/infohash.cpp b/src/infohash.cpp
index 7835c8b3dc563fe5339397e34f8fd64ac1661957..c00a2e551b2c2602abfc8152e0c64fcbe277f0b1 100644
--- a/src/infohash.cpp
+++ b/src/infohash.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2014-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include "infohash.h"
diff --git a/src/rng.cpp b/src/rng.cpp
index 3e02bbd79aa78a4a4aeca868c4b18583edf5ca9d..2d1556edda996b246ee6770dfd79f922ce99cbb8 100644
--- a/src/rng.cpp
+++ b/src/rng.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2014-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include "rng.h"
diff --git a/src/securedht.cpp b/src/securedht.cpp
index 5ee1e2fd67e896d477b454200da16844fe4eea81..d646975780822c8b3dcd6bc9a0d4f7b2197d29dd 100644
--- a/src/securedht.cpp
+++ b/src/securedht.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2014-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include "securedht.h"
diff --git a/src/value.cpp b/src/value.cpp
index 16b6380156153a020d6296978e3604e9188ec743..2d1bdad5e9e5477530ac6207d25bec726f1e1fc1 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2014-2015 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include "value.h"
diff --git a/tools/dhtchat.cpp b/tools/dhtchat.cpp
index c610b546560d60440855874a4084c190c7b0e580..9b6719bbd34781cad74f5212169ff278587cc5ff 100644
--- a/tools/dhtchat.cpp
+++ b/tools/dhtchat.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2014-2015 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
@@ -16,17 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include "tools_common.h"
diff --git a/tools/dhtnode.cpp b/tools/dhtnode.cpp
index 3dae0d3732292b0b86313a125badf57b52419f50..0a0a9e027e718bacfb3b9367651bb1683ccb48a1 100644
--- a/tools/dhtnode.cpp
+++ b/tools/dhtnode.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2014-2015 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
@@ -16,17 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include "tools_common.h"
diff --git a/tools/dhtscanner.cpp b/tools/dhtscanner.cpp
index f2c6ecd47dff077b7755d4a69eab40b1b3d52cd2..507711c9d7757c5f04c12af95542d792b3668765 100644
--- a/tools/dhtscanner.cpp
+++ b/tools/dhtscanner.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ *  Copyright (C) 2014-2015 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
@@ -16,17 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 #include "tools_common.h"
diff --git a/tools/tools_common.h b/tools/tools_common.h
index c1aebb090a71f79744d42833fa1a656cf1c91d2a..c1a73d854c4e1087a70d3a1b50a46d768b4c7847 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-2015 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
@@ -16,17 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
  */
 
 // Common utility methods used by C++ OpenDHT tools.