diff --git a/.mailmap b/.mailmap
index e8015249649dfcd86790b69125fd28aa2ca4123f..a36ddc1dc98fe71fca70ba77a36af4843dd20e10 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,6 +17,7 @@ Taylor Gerring <taylor.gerring@gmail.com> <taylor.gerring@ethereum.org>
Bas van Kervel <bas@ethdev.com>
Bas van Kervel <bas@ethdev.com> <basvankervel@ziggo.nl>
Bas van Kervel <bas@ethdev.com> <basvankervel@gmail.com>
+Bas van Kervel <bas@ethdev.com> <bas-vk@users.noreply.github.com>
Sven Ehlert <sven@ethdev.com>
@@ -62,4 +63,30 @@ Joseph Chow <ethereum@outlook.com> ethers <TODO>
Enrique Fynn <enriquefynn@gmail.com>
-Vincent G <caktux@gmail.com>
\ No newline at end of file
+Vincent G <caktux@gmail.com>
+
+RJ Catalano <rj@erisindustries.com>
+
+Nchinda Nchinda <nchinda2@gmail.com>
+
+Aron Fischer <homotopycolimit@users.noreply.github.com>
+
+Vlad Gluhovsky <gluk256@users.noreply.github.com>
+
+Ville Sundell <github@solarius.fi>
+
+Elliot Shepherd <elliot@identitii.com>
+
+Yohann Léon <sybiload@gmail.com>
+
+Gregg Dourgarian <greggd@tempworks.com>
+
+Casey Detrio <cdetrio@gmail.com>
+
+Jens Agerberg <github@agerberg.me>
+
+Nick Johnson <arachnid@notdot.net>
+
+Henning Diedrich <hd@eonblast.com>
+Henning Diedrich <hd@eonblast.com> Drake Burroughs <wildfyre@hotmail.com>
+
diff --git a/AUTHORS b/AUTHORS
index 69eb54874fd66df02dfd8f3a38d4a69e471b86d9..50f3c713d1afe434586970412d97c6a8e30ac8b0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,36 +1,63 @@
# This is the official list of go-ethereum authors for copyright purposes.
+Ales Katona <ales@coinbase.com>
Alex Leverington <alex@ethdev.com>
Alexandre Van de Sande <alex.vandesande@ethdev.com>
+Aron Fischer <homotopycolimit@users.noreply.github.com>
Bas van Kervel <bas@ethdev.com>
+Benjamin Brent <benjamin@benjaminbrent.com>
+Casey Detrio <cdetrio@gmail.com>
Christoph Jentzsch <jentzsch.software@gmail.com>
Daniel A. Nagy <nagy.da@gmail.com>
-Drake Burroughs <wildfyre@hotmail.com>
+Elliot Shepherd <elliot@identitii.com>
Enrique Fynn <enriquefynn@gmail.com>
Ethan Buchman <ethan@coinculture.info>
Fabian Vogelsteller <fabian@frozeman.de>
+Fabio Berger <fabioberger1991@gmail.com>
Felix Lange <fjl@twurst.com>
+Gregg Dourgarian <greggd@tempworks.com>
Gustav Simonsson <gustav.simonsson@gmail.com>
+Hao Bryan Cheng <haobcheng@gmail.com>
+Henning Diedrich <hd@eonblast.com>
Isidoro Ghezzi <isidoro.ghezzi@icloud.com>
Jae Kwon <jkwon.work@gmail.com>
Jason Carver <jacarver@linkedin.com>
Jeff R. Allen <jra@nella.org>
Jeffrey Wilcke <jeffrey@ethereum.org>
+Jens Agerberg <github@agerberg.me>
+Jonathan Brown <jbrown@bluedroplet.com>
Joseph Chow <ethereum@outlook.com>
+Justin Clark-Casey <justincc@justincc.org>
+Kenji Siu <kenji@isuntv.com>
Kobi Gurkan <kobigurk@gmail.com>
Lefteris Karapetsas <lefteris@refu.co>
Leif Jurvetson <leijurv@gmail.com>
Maran Hidskes <maran.hidskes@gmail.com>
Marek Kotewicz <marek.kotewicz@gmail.com>
+Martin Holst Swende <martin@swende.se>
+Matthew Di Ferrante <mattdf@users.noreply.github.com>
Matthew Wampler-Doty <matthew.wampler.doty@gmail.com>
+Nchinda Nchinda <nchinda2@gmail.com>
Nick Dodson <silentcicero@outlook.com>
+Nick Johnson <arachnid@notdot.net>
+Paulo L F Casaretto <pcasaretto@gmail.com>
Peter Pratscher <pratscher@gmail.com>
Péter Szilágyi <peterke@gmail.com>
+RJ Catalano <rj@erisindustries.com>
Ramesh Nair <ram@hiddentao.com>
Ricardo Catalinas Jiménez <r@untroubled.be>
Rémy Roy <remyroy@remyroy.com>
+Stein Dekker <dekker.stein@gmail.com>
+Steven Roose <stevenroose@gmail.com>
Taylor Gerring <taylor.gerring@gmail.com>
+Thomas Bocek <tom@tomp2p.net>
+Tosh Camille <tochecamille@gmail.com>
Viktor Trón <viktor.tron@gmail.com>
+Ville Sundell <github@solarius.fi>
Vincent G <caktux@gmail.com>
Vitalik Buterin <v@buterin.com>
+Vlad Gluhovsky <gluk256@users.noreply.github.com>
+Yohann Léon <sybiload@gmail.com>
+Yoichi Hirai <i@yoichihirai.com>
Zsolt Felföldi <zsfelfoldi@gmail.com>
+ΞTHΞЯSPHΞЯΞ <{viktor.tron,nagydani,zsfelfoldi}@gmail.com>
diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go
index a4e90914f988d448557d4bbb6a38d70dd4cc12f1..4509e222d5231c189e46a5b86038ad1b1ccaa731 100644
--- a/accounts/abi/bind/backend.go
+++ b/accounts/abi/bind/backend.go
@@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
index 74203a468de7da718ecb9f74607928f5c7bad398..bdc2a98bc8e660dfdf26103ad42be4f8bdd09dc3 100644
--- a/accounts/abi/bind/backends/simulated.go
+++ b/accounts/abi/bind/backends/simulated.go
@@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go
index 965f51e85662ef3d0da02a8dd1b83e87d578b154..b032ef72d96b310682d5de78af5d03673cf247a5 100644
--- a/accounts/abi/bind/base.go
+++ b/accounts/abi/bind/base.go
@@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/build/update-license.go b/build/update-license.go
index 94b319550673d2d9acd146b883655770fadf46da..e0c273deff9765b1535ac377f786093bf7b5d0e1 100644
--- a/build/update-license.go
+++ b/build/update-license.go
@@ -53,6 +53,7 @@ var (
"contracts/chequebook/contract/",
"contracts/ens/contract/",
"contracts/release/contract.go",
+ "p2p/discv5/nodeevent_string.go",
}
// paths with this prefix are licensed as GPL. all other files are LGPL.
diff --git a/cmd/utils/version.go b/cmd/utils/version.go
index 03633d694a80b66e3208f1d83bf5b0b61edc7038..b057f4293b7fbce18dc7c696ca0d9725397d7ac4 100644
--- a/cmd/utils/version.go
+++ b/cmd/utils/version.go
@@ -1,4 +1,4 @@
-// Copyright 2014 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of go-ethereum.
//
// go-ethereum is free software: you can redistribute it and/or modify
diff --git a/cmd/v5test/main.go b/cmd/v5test/main.go
index e537760c60c8e7e65701d9662435a34ca497e7d3..1daff56f87afbfab61cfe3b95491be94226be4cd 100644
--- a/cmd/v5test/main.go
+++ b/cmd/v5test/main.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of go-ethereum.
//
// go-ethereum is free software: you can redistribute it and/or modify
diff --git a/common/math/exp.go b/common/math/exp.go
index 3fd31bd761b1bb6799dbfcec1b9bcd2b513da768..6f6c040e0764facf5b126d4e50b2384cd69557f4 100644
--- a/common/math/exp.go
+++ b/common/math/exp.go
@@ -1,3 +1,19 @@
+// Copyright 2016 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package math
import (
diff --git a/console/bridge.go b/console/bridge.go
index 24a777d78d9b25bec48489a5f5f65fb84d07774c..7f7e6feb11aa314e0e7ee9ace50fb0659849bc2e 100644
--- a/console/bridge.go
+++ b/console/bridge.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/console/console.go b/console/console.go
index 3cde9b8f53cde1102c26be1c968dc2d4e72ffa2d..6e3d7e43cb6e07f8aafdc1f4e947ec95f27c3d97 100644
--- a/console/console.go
+++ b/console/console.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/contracts/release/release.go b/contracts/release/release.go
index 8d1710197cea7a011207ebfe7bfff984ba678513..cd79112cd141a8719dfdef809ac0e2a4d27c8c95 100644
--- a/contracts/release/release.go
+++ b/contracts/release/release.go
@@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/core/types/json_test.go b/core/types/json_test.go
index e17424c821b326fce1719418c809fd91331df3ec..a028b5d08c9b10091a58f97c97f6dfcaa0fbba3c 100644
--- a/core/types/json_test.go
+++ b/core/types/json_test.go
@@ -1,3 +1,19 @@
+// Copyright 2016 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package types
import (
diff --git a/eth/api_backend.go b/eth/api_backend.go
index 639f186c1bd6b18556b8173d404787c02428d642..efe9a7a011dc6d3d128a72def65ad076ef5d9153 100644
--- a/eth/api_backend.go
+++ b/eth/api_backend.go
@@ -1,18 +1,18 @@
// Copyright 2015 The go-ethereum Authors
-// This file is part of go-ethereum.
+// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// go-ethereum is distributed in the hope that it will be useful,
+// The go-ethereum library 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.
+// GNU Lesser General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
package eth
diff --git a/eth/bad_block.go b/eth/bad_block.go
index 3a6c3d85cb88357fa57cb639351133ee415b81a3..e0f05f540fd3bf20e10755178ccb2da8955c78a2 100644
--- a/eth/bad_block.go
+++ b/eth/bad_block.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/eth/bind.go b/eth/bind.go
index 0931c5f3b00690a5fd5d04faf807dc388bdb3f7a..747965d37038e8d765e94c6113cf427c8936bd10 100644
--- a/eth/bind.go
+++ b/eth/bind.go
@@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/eth/db_upgrade.go b/eth/db_upgrade.go
index 172bb0954a035e1a2702087d91e5849041105e13..5fd73a58677bf1571c3255414e995a0f9aa47aed 100644
--- a/eth/db_upgrade.go
+++ b/eth/db_upgrade.go
@@ -1,4 +1,4 @@
-// Copyright 2014 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/eth/gasprice/lightprice.go b/eth/gasprice/lightprice.go
index f6d290bb7e37a0aa1fd1e13e263a99709ea4bdb6..8886d32d7dcef5476875f58fb9da6cf363d5ce48 100644
--- a/eth/gasprice/lightprice.go
+++ b/eth/gasprice/lightprice.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go
index 0cc11eb5b4df228cc8b88e6bc17b083ea601b6ea..102c0d3b21f409bed8cd9412f48cb7d64dca10f8 100644
--- a/ethclient/ethclient_test.go
+++ b/ethclient/ethclient_test.go
@@ -1,3 +1,19 @@
+// Copyright 2016 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package ethclient
import "github.com/ethereum/go-ethereum"
diff --git a/internal/build/azure.go b/internal/build/azure.go
index ceac6a4cd5ccac19780ef0a0b38a31760799a7b0..32f53555813911bed1667d3d8da68851bd5bf3af 100644
--- a/internal/build/azure.go
+++ b/internal/build/azure.go
@@ -1,3 +1,4 @@
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/internal/build/pgp.go b/internal/build/pgp.go
index 7938df51a587347bc30f7616fde25e29a2cc8b69..79ab9c06f1b5c42abcfa995df384ff5aeb68a73e 100644
--- a/internal/build/pgp.go
+++ b/internal/build/pgp.go
@@ -1,3 +1,4 @@
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index 806005482b3cfc8429decc17799b469c9bd0b5e6..36bb8c077c309538dc77cf19638a2189d910c593 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go
index ec5a84c5c04cfd220f9013833229f973e0c49e18..f9358b6cfd3dd6082af51eb7b702547770f1381b 100644
--- a/internal/ethapi/backend.go
+++ b/internal/ethapi/backend.go
@@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2015 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/internal/jsre/pretty.go b/internal/jsre/pretty.go
index f32e16243487dcc735d05507240029f64057c00b..8fe00cc4c828f1e4b58fd59b5938f5edec7605c6 100644
--- a/internal/jsre/pretty.go
+++ b/internal/jsre/pretty.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/api_backend.go b/les/api_backend.go
index d50b3ea33f4ed73cbde84af9faad8ebd41e49456..04120c669fd959008603d596c048494abaa7cdf8 100644
--- a/les/api_backend.go
+++ b/les/api_backend.go
@@ -1,18 +1,18 @@
-// Copyright 2015 The go-ethereum Authors
-// This file is part of go-ethereum.
+// Copyright 2016 The go-ethereum Authors
+// This file is part of the go-ethereum library.
//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
-// go-ethereum is distributed in the hope that it will be useful,
+// The go-ethereum library 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.
+// GNU Lesser General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
package les
diff --git a/les/backend.go b/les/backend.go
index 33c48e92a50fa2e6b3771d047a26947ab114611f..38d1fd3800001f72dfa6d4e5ac290d5a93335c92 100644
--- a/les/backend.go
+++ b/les/backend.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/fetcher.go b/les/fetcher.go
index d93b7db37663a70df9f4a4e0a7850c7a40011f24..ae9bf84749d254bd526ddcdc700517a17a23fbec 100644
--- a/les/fetcher.go
+++ b/les/fetcher.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go
index 1b569db0bc28137701c3c1496b8fb053c145192e..0b8d7f58f52dff9dc7026ddc25b6ceecd076b28d 100644
--- a/les/flowcontrol/control.go
+++ b/les/flowcontrol/control.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go
index c0469e7b66a64e9824707011d3df1025757016f7..786884437b7c00223bb6c88f8810a9017a208afd 100644
--- a/les/flowcontrol/manager.go
+++ b/les/flowcontrol/manager.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/handler.go b/les/handler.go
index d2ed488701996042e3449a4f14682e083c465099..44a0a1661b6e83dc4abdb481668d0b34165a6ca6 100644
--- a/les/handler.go
+++ b/les/handler.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/handler_test.go b/les/handler_test.go
index 2aa7a5590604586863ad1ae06f14430cd3b17927..37c5dd2268627aadc0055eafff035ae2e81a46ce 100644
--- a/les/handler_test.go
+++ b/les/handler_test.go
@@ -1,3 +1,19 @@
+// Copyright 2016 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package les
import (
diff --git a/les/helper_test.go b/les/helper_test.go
index 0b7576f6a68fb2c7cd7474bf07e732af3350f291..1b3c29e48798271190ffdd683442921458e8696a 100644
--- a/les/helper_test.go
+++ b/les/helper_test.go
@@ -1,3 +1,19 @@
+// Copyright 2016 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
// This file contains some shares testing functionality, common to multiple
// different files and modules being tested.
diff --git a/les/metrics.go b/les/metrics.go
index 88e6726e24d8e364a9fbd59ee19124cfb43df598..aa0796790e1db8280b64c2ad9d93d4c7950cee34 100644
--- a/les/metrics.go
+++ b/les/metrics.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/odr.go b/les/odr.go
index 2674ba6a19b99c3f87390ff2d6d03eef99b182c9..444b1da2a2c371fd94f533425d2221551dc41957 100644
--- a/les/odr.go
+++ b/les/odr.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
@@ -13,6 +13,7 @@
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package les
import (
diff --git a/les/odr_peerset.go b/les/odr_peerset.go
index 0323ce27fcf96486e1dbef8a5f01b91291e0846a..e9b7eec7ff0af95a14efdc22404cae80ad5daf4f 100644
--- a/les/odr_peerset.go
+++ b/les/odr_peerset.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
@@ -13,6 +13,7 @@
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package les
import (
diff --git a/les/odr_requests.go b/les/odr_requests.go
index bf03469778a3b2814a52e40d093bd0c98d7672f0..f4bd5188866bf02e2ee6ffb6aaf512bbd541b7aa 100644
--- a/les/odr_requests.go
+++ b/les/odr_requests.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/odr_test.go b/les/odr_test.go
index cdf62464b495278c83193f6003f874383694eb6b..3c8ea8c3fad87aacc6e5a7dc92c2ec706d829cec 100644
--- a/les/odr_test.go
+++ b/les/odr_test.go
@@ -1,3 +1,19 @@
+// Copyright 2016 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package les
import (
diff --git a/les/peer.go b/les/peer.go
index dbddbb0206eec37eae180961af741f65e987aa04..5d566d8992868f4b6585077dbdfa92e2d1897290 100644
--- a/les/peer.go
+++ b/les/peer.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/protocol.go b/les/protocol.go
index 3d2de64e19a64f7f8e8829cc096e5e87c985942d..46da2b8c8b595fd61f73bfd1bb7594ae4625815b 100644
--- a/les/protocol.go
+++ b/les/protocol.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/request_test.go b/les/request_test.go
index 77788d4a94e22a345a26edcc5d80e1fc7734f278..a6fbb06ce3da31712658e8877952cd6333724792 100644
--- a/les/request_test.go
+++ b/les/request_test.go
@@ -1,3 +1,19 @@
+// Copyright 2016 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package les
import (
diff --git a/les/server.go b/les/server.go
index 0f0e2db4251853669449045e7dfdd93cd765d62e..daa28be05840f3a6349b36eb9d791ccaab3724b8 100644
--- a/les/server.go
+++ b/les/server.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/sync.go b/les/sync.go
index f92f8ce04bbedcfd4a6778f4bab16d632f8882cc..72c979c61fe44429b8a586d3a2f99ce32e3c771d 100644
--- a/les/sync.go
+++ b/les/sync.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/les/txrelay.go b/les/txrelay.go
index 2df2fa0a95d38dc936800e8edca3ee14771d55f6..036158f5d252f98dbf8b40cc919d3ac95074aa90 100644
--- a/les/txrelay.go
+++ b/les/txrelay.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
@@ -13,6 +13,7 @@
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package les
import (
diff --git a/light/lightchain.go b/light/lightchain.go
index 792b8aa87484f2c167a9ecdfe876b779a57b6c30..461030369a02cf25cad80f7e4141c153f6444cce 100644
--- a/light/lightchain.go
+++ b/light/lightchain.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
@@ -13,6 +13,7 @@
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package light
import (
diff --git a/light/lightchain_test.go b/light/lightchain_test.go
index 60b909e975c15de3073d0bb90f01b0e1c93721c6..e42feb026cbc14f478eecb7f1b07bc7311797b2e 100644
--- a/light/lightchain_test.go
+++ b/light/lightchain_test.go
@@ -1,4 +1,4 @@
-// Copyright 2014 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/light/odr_test.go b/light/odr_test.go
index 892b56e94e73488de9c6af352d73f880735bd6f7..9c83e91c688c5284b4fc2d70bd1ff7ca7cbb1d34 100644
--- a/light/odr_test.go
+++ b/light/odr_test.go
@@ -1,3 +1,19 @@
+// Copyright 2016 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package light
import (
diff --git a/light/odr_util.go b/light/odr_util.go
index 458f8233b9bf4aa6f03f93228e30c531367885fa..5c72f90e9b89d9af10c721a031507035cb55c0b1 100644
--- a/light/odr_util.go
+++ b/light/odr_util.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
@@ -13,6 +13,7 @@
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
package light
import (
diff --git a/light/txpool.go b/light/txpool.go
index 5c4e2dd82c335a34d6031a743373424420973fc8..825a0f9099eabe4abc79b5950b115359ca0e042a 100644
--- a/light/txpool.go
+++ b/light/txpool.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/light/txpool_test.go b/light/txpool_test.go
index 2aee4bedbf4a5f916c234c1890efdb943db8e92a..4ff1006e52bbfd21fd6c9ab7223e9a77e7d0c7e1 100644
--- a/light/txpool_test.go
+++ b/light/txpool_test.go
@@ -1,4 +1,4 @@
-// Copyright 2014 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/light/vm_env.go b/light/vm_env.go
index e2b43b99beabed3b07d2d4e7ebaf885622e0a2b2..0978755cf1165e7b637d7b72be5acb31c46eb3ff 100644
--- a/light/vm_env.go
+++ b/light/vm_env.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/p2p/discv5/crypto.go b/p2p/discv5/crypto.go
index f68d0390816f9825ca957137b3c9cf536361b592..48b2a8a729afe68384fd6735880ce0c2da6e3db7 100644
--- a/p2p/discv5/crypto.go
+++ b/p2p/discv5/crypto.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go
index 31d2ea1b74451853c8607d3d6abec9861c3575fa..5c8c507060d05b47cd9fe43a87be7c6f32819173 100644
--- a/p2p/discv5/table.go
+++ b/p2p/discv5/table.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go
index b7335540ae4618a3b42e3fd4182541a274bafb3f..a29943dab9b3274706a938773d835d28e445d75d 100644
--- a/p2p/discv5/table_test.go
+++ b/p2p/discv5/table_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go
index 3f9711ec0f528302e57997f58ff90b104b87cbc5..3ee2f7fc4633802b6bbc3be0edc9283d2ec33d16 100644
--- a/p2p/discv5/ticket.go
+++ b/p2p/discv5/ticket.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go
index e603cf7e4916845a4873d0a26a743c697027b442..625921e84c116d016aa6ecc5cee1efc931c45d3e 100644
--- a/p2p/discv5/topic.go
+++ b/p2p/discv5/topic.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go
index f29df1638657ca02bd66d6f34bb9d33c74ee697b..ba79993f29e96500dcf080dacfb75b1fb2e731e8 100644
--- a/p2p/discv5/topic_test.go
+++ b/p2p/discv5/topic_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go
index 328d94ef7ae5638b8d40f1e83135678323781609..af961984cabff7e9d13583da842fb859ab47c019 100644
--- a/p2p/discv5/udp.go
+++ b/p2p/discv5/udp.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go
index 267eaf225f105550ff39aaea4e1e7a1c8d6782de..cacc0f00468ad95672b4de9c88f09a8caafb7704 100644
--- a/p2p/discv5/udp_test.go
+++ b/p2p/discv5/udp_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The go-ethereum Authors
+// Copyright 2016 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
diff --git a/swarm/network/protocol_test.go b/swarm/network/protocol_test.go
index 91dea8cac3c1f83dd41478804c4c341c154f45e1..988d0ac923c978340565153e537fcd2c82867e15 100644
--- a/swarm/network/protocol_test.go
+++ b/swarm/network/protocol_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2014 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify