diff --git a/.mailmap b/.mailmap
index 704d3974868ac4a19d2ae4c696171e5aa84565c8..e8015249649dfcd86790b69125fd28aa2ca4123f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -59,3 +59,7 @@ Jason Carver <jacarver@linkedin.com> <ut96caarrs@snkmail.com>
 
 Joseph Chow <ethereum@outlook.com>
 Joseph Chow <ethereum@outlook.com> ethers <TODO>
+
+Enrique Fynn <enriquefynn@gmail.com>
+
+Vincent G <caktux@gmail.com>
\ No newline at end of file
diff --git a/AUTHORS b/AUTHORS
index 0c5b547d7aff09db9cf4f3180a76986380e83822..69eb54874fd66df02dfd8f3a38d4a69e471b86d9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,22 +3,34 @@
 Alex Leverington <alex@ethdev.com>
 Alexandre Van de Sande <alex.vandesande@ethdev.com>
 Bas van Kervel <bas@ethdev.com>
+Christoph Jentzsch <jentzsch.software@gmail.com>
 Daniel A. Nagy <nagy.da@gmail.com>
+Drake Burroughs <wildfyre@hotmail.com>
+Enrique Fynn <enriquefynn@gmail.com>
 Ethan Buchman <ethan@coinculture.info>
 Fabian Vogelsteller <fabian@frozeman.de>
 Felix Lange <fjl@twurst.com>
 Gustav Simonsson <gustav.simonsson@gmail.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>
 Joseph Chow <ethereum@outlook.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>
 Matthew Wampler-Doty <matthew.wampler.doty@gmail.com>
 Nick Dodson <silentcicero@outlook.com>
+Peter Pratscher <pratscher@gmail.com>
 Péter Szilágyi <peterke@gmail.com>
+Ramesh Nair <ram@hiddentao.com>
+Ricardo Catalinas Jiménez <r@untroubled.be>
+Rémy Roy <remyroy@remyroy.com>
 Taylor Gerring <taylor.gerring@gmail.com>
 Viktor Trón <viktor.tron@gmail.com>
+Vincent G <caktux@gmail.com>
 Vitalik Buterin <v@buterin.com>
 Zsolt Felföldi <zsfelfoldi@gmail.com>
diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go
index cdd182512dc1c833353c01a0ea303621cf408d17..b5054a0329a967f99b54351a68090162586d4660 100644
--- a/accounts/abi/event_test.go
+++ b/accounts/abi/event_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 abi
 
 import (
diff --git a/accounts/key_store_plain.go b/accounts/key_store_plain.go
index ceb455281384a22eb8ca3c1cf052b060d8eeb4e5..2cbaa94df54c0da83036c60b0e79851320dfc2fc 100644
--- a/accounts/key_store_plain.go
+++ b/accounts/key_store_plain.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/cmd/abigen/main.go b/cmd/abigen/main.go
index 88d27e4439df19a4979d525ef81a1aa2ac4996a2..f3639135100ef151042d939d24135c4a64bff473 100644
--- a/cmd/abigen/main.go
+++ b/cmd/abigen/main.go
@@ -1,18 +1,18 @@
 // Copyright 2016 The go-ethereum Authors
-// This file is part of the go-ethereum library.
+// This file is part of go-ethereum.
 //
-// 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
+// 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 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,
+// go-ethereum 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.
+// GNU 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/>.
+// You should have received a copy of the GNU General Public License
+// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
 package main
 
diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index d5518f94bc9dd992de9b24fdc530be1a2631ee3b..95cf85e4ba3ec9729258ec8b8b762de977f83860 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -1,4 +1,4 @@
-// Copyright 2014 The go-ethereum Authors
+// Copyright 2015 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/utils/client.go b/cmd/utils/client.go
index 3913d007b99a3ea5ce2ec6711cd9ee927c238bc1..ec72a1a4b3fe4a9a35f1c63acee44cefca2aa727 100644
--- a/cmd/utils/client.go
+++ b/cmd/utils/client.go
@@ -1,18 +1,18 @@
 // Copyright 2015 The go-ethereum Authors
-// This file is part of the go-ethereum library.
+// This file is part of go-ethereum.
 //
-// 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
+// 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 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,
+// go-ethereum 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.
+// GNU 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/>.
+// You should have received a copy of the GNU General Public License
+// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
 package utils
 
diff --git a/cmd/utils/jeth.go b/cmd/utils/jeth.go
index cccf1bcf8f140fb9ad776e7772ba48f5444c80de..0017790f3b280d37e2080b56e0b7424cc512ff89 100644
--- a/cmd/utils/jeth.go
+++ b/cmd/utils/jeth.go
@@ -1,18 +1,18 @@
 // Copyright 2015 The go-ethereum Authors
-// This file is part of the go-ethereum library.
+// This file is part of go-ethereum.
 //
-// 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
+// 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 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,
+// go-ethereum 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.
+// GNU 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/>.
+// You should have received a copy of the GNU General Public License
+// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
 package utils
 
diff --git a/common/natspec/natspec.go b/common/natspec/natspec.go
index 8197018cf4b41e854e2a2b149aae7929d6d2e989..4521ff7a1b2ac984d52ca41579d15db60be123f5 100644
--- a/common/natspec/natspec.go
+++ b/common/natspec/natspec.go
@@ -13,7 +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/>.
-//
+
 // +build ignore
 
 package natspec
diff --git a/common/natspec/natspec_e2e_test.go b/common/natspec/natspec_e2e_test.go
index 0730391c744ca1ebceaf7a7197afe2bc2976b7ea..25526057692c22febf5d31f167f4fa189a9c69ba 100644
--- a/common/natspec/natspec_e2e_test.go
+++ b/common/natspec/natspec_e2e_test.go
@@ -13,7 +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/>.
-//
+
 // +build ignore
 
 package natspec
diff --git a/common/natspec/natspec_test.go b/common/natspec/natspec_test.go
index 53e6a3a90aec73ad4d200f60ae05afbec83376fc..50fd3f66514a95d15965682b6dd4df8795ab0c55 100644
--- a/common/natspec/natspec_test.go
+++ b/common/natspec/natspec_test.go
@@ -13,7 +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/>.
-//
+
 // +build ignore
 
 package natspec
diff --git a/core/block_validator.go b/core/block_validator.go
index 747e61ccc8e97de55575bb6ea8521d76b25dd238..555c5ee0647365210c670388b1e5cc491ec83192 100644
--- a/core/block_validator.go
+++ b/core/block_validator.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/default_genesis.go b/core/default_genesis.go
index b418bfdfe017b7954e4a3f9a533b854c9f25ea54..6ffe04ee8028f237cca8092044e577dfb2de59ba 100644
--- a/core/default_genesis.go
+++ b/core/default_genesis.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/gaspool.go b/core/gaspool.go
index 2ef07c7541746fdd97d0e35bdf12bbe9eb2e4623..f1c64c97aaf03b54fcdc39c6354e16e75e5ffbfe 100644
--- a/core/gaspool.go
+++ b/core/gaspool.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/headerchain.go b/core/headerchain.go
index 21fc6e80a25cf114b9dc977118cfd8e296c892b5..5e0fbfb08f1ee7f12f22dc55346675eebe048b77 100644
--- a/core/headerchain.go
+++ b/core/headerchain.go
@@ -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 core
 
 import (
diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go
index 8b68870c6ec0409c936fd5ed35428e199f62c683..aa05c5dfe752c9140507e34efe0cc5393437bd27 100644
--- a/core/state/iterator_test.go
+++ b/core/state/iterator_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/core/state/statedb_test.go b/core/state/statedb_test.go
index 8138f8d783d7e3a9e2f736a42b91096a091c2860..92833345976920d89e31c836f1d6484a80f9fa4a 100644
--- a/core/state/statedb_test.go
+++ b/core/state/statedb_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/core/state_processor.go b/core/state_processor.go
index 441f6a7a854dc7a5aad53739fa0507170d9ff840..95b3057bbc540d1d9d502911bca0df69d0bc2e55 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -1,3 +1,19 @@
+// 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
+// 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 core
 
 import (
diff --git a/core/types.go b/core/types.go
index e2b31643a8eba122ebf0e97a61020b31bebe482d..20f33a153fe5ae8fa328a899bcceb72050eff0e1 100644
--- a/core/types.go
+++ b/core/types.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/vm/contract.go b/core/vm/contract.go
index 59e8f1aa6c9c425928f11382f06ddeb7dabeaef4..844d3f328ee54897329ae184b5eebfcf3c85c033 100644
--- a/core/vm/contract.go
+++ b/core/vm/contract.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/vm/doc.go b/core/vm/doc.go
index de7fa6021881d45121798dcd55ecf0541c0db099..239be2cfec7fc9ef84616f3271cd979b819b3bd0 100644
--- a/core/vm/doc.go
+++ b/core/vm/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/vm/instructions.go b/core/vm/instructions.go
index 942fafde723c05648a20d845953c48e11b882c15..e2fc5ee0f19f8da4acda1cbd295a89b2b82f99e4 100644
--- a/core/vm/instructions.go
+++ b/core/vm/instructions.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/vm/jit.go b/core/vm/jit.go
index ac2083f54cfb710740b5b6db7fec83cd21d1910e..f56d7c1af367f3a2ca2901995121c0323b0125e0 100644
--- a/core/vm/jit.go
+++ b/core/vm/jit.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/vm/jit_optimiser.go b/core/vm/jit_optimiser.go
index 845ffbbdf9ef3001372911583be1c7309764c02f..31ad0c2e2b6c670886e4905a173a11e08d471d56 100644
--- a/core/vm/jit_optimiser.go
+++ b/core/vm/jit_optimiser.go
@@ -1,3 +1,19 @@
+// 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
+// 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 vm
 
 import (
diff --git a/core/vm/jit_test.go b/core/vm/jit_test.go
index c503a3a8167f02e9a3b33d3b183f16b93cf3644b..403c15a8db44a9a27717092c13f5a90563ca8e12 100644
--- a/core/vm/jit_test.go
+++ b/core/vm/jit_test.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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
@@ -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 vm
 
 import (
diff --git a/core/vm/jit_util.go b/core/vm/jit_util.go
index 72e9ccf8f7159064bdd1ba229e1e5af38a7533e4..947dae88f44da49e076b4926f0b827afd93d0b0f 100644
--- a/core/vm/jit_util.go
+++ b/core/vm/jit_util.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/vm/jit_util_test.go b/core/vm/jit_util_test.go
index 686bee0ac1b9bd44547685a4104ea8407f362dde..1f4cb2b165957c52eef76dbe017baa47d0268f1f 100644
--- a/core/vm/jit_util_test.go
+++ b/core/vm/jit_util_test.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/vm/jump_table.go b/core/vm/jump_table.go
index 2c379667937ba177eb3bfb457f3835e7e0de50b9..255c4f18991689a08e5b67d62781339f6a3ccebe 100644
--- a/core/vm/jump_table.go
+++ b/core/vm/jump_table.go
@@ -1,3 +1,19 @@
+// 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
+// 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 vm
 
 import "math/big"
diff --git a/core/vm/jump_table_test.go b/core/vm/jump_table_test.go
index 2386a7525e3977d55e182a10324ddbd5dc767477..4fcb4a220ad23683b6e8fde5f4abda1196bc54b3 100644
--- a/core/vm/jump_table_test.go
+++ b/core/vm/jump_table_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 vm
 
 import (
diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go
index 1e943940bdab95edf457b262c55220156f65a444..d8c98e545889e8d58a53a9bae07861ffe0f15219 100644
--- a/core/vm/runtime/env.go
+++ b/core/vm/runtime/env.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/vm/runtime/runtime.go b/core/vm/runtime/runtime.go
index 553864a83422f9829dceb48ebb54aec058413a9d..309d508c3d6d4babb7ffa48ceee722c5c856ce96 100644
--- a/core/vm/runtime/runtime.go
+++ b/core/vm/runtime/runtime.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/vm/segments.go b/core/vm/segments.go
index fd40651490bd7370737676e4c0814254c57a3598..c69ceddf46d99271c047f8f9481d6f0420ba3798 100644
--- a/core/vm/segments.go
+++ b/core/vm/segments.go
@@ -1,3 +1,19 @@
+// 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
+// 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 vm
 
 import "math/big"
diff --git a/core/vm/util_test.go b/core/vm/util_test.go
index 3da742bfa08e3834d9855026bffd455b9f371884..f0d825555fe834e19f40e4e40c2872882e09b5e0 100644
--- a/core/vm/util_test.go
+++ b/core/vm/util_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 vm
 
 import "math/big"
diff --git a/eth/api.go b/eth/api.go
index f0fbef1efec87085a6d4d5b757581cb7e670f743..41387c27f063bdd6063c8ecbf09dd26784c667bb 100644
--- a/eth/api.go
+++ b/eth/api.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/backend_test.go b/eth/backend_test.go
index 83219de6211699c184f6bab8a6d24aac53a19e54..c2bed879ba140cc176b5086f953b76f2a0229c7f 100644
--- a/eth/backend_test.go
+++ b/eth/backend_test.go
@@ -1,3 +1,19 @@
+// 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
+// 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 eth
 
 import (
diff --git a/eth/cpu_mining.go b/eth/cpu_mining.go
index f8795fd0cec4667290bffd0aa660ff3ab04d06dc..3469d394e98c6ebe4d4da87a37651994a5ca43ec 100644
--- a/eth/cpu_mining.go
+++ b/eth/cpu_mining.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/downloader/api.go b/eth/downloader/api.go
index 576b33f1d8b840e6881c748b0b7bacbd2500b475..670a3ade39625c903c6dd47b702e6c58148afb92 100644
--- a/eth/downloader/api.go
+++ b/eth/downloader/api.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 downloader
 
diff --git a/eth/filters/api.go b/eth/filters/api.go
index 956660363805c677a0cedde07b9b8bd404d6a6dd..54336aaf9bf27163cc4e79ffeb48189cc4352534 100644
--- a/eth/filters/api.go
+++ b/eth/filters/api.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 filters
 
diff --git a/eth/filters/filter.go b/eth/filters/filter.go
index 96af93c4a3dd57187d2f001ca790dc3364a9036b..469dfba4d1f64d3a84c90942d37881b7b1ddb101 100644
--- a/eth/filters/filter.go
+++ b/eth/filters/filter.go
@@ -1,4 +1,4 @@
-// Copyright 2015 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
diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go
index b61a493b62ed528b8218924d9ca6fd1519ee95c5..29968530a3cc8cdf7a69f4540db0422169f3a2b1 100644
--- a/eth/filters/filter_system.go
+++ b/eth/filters/filter_system.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/filters/filter_system_test.go b/eth/filters/filter_system_test.go
index 7904d7d334a5b1d72de713d6f8c69b247771fe21..7757fb84e530d19e3c199c8796645e2bad9b6eb8 100644
--- a/eth/filters/filter_system_test.go
+++ b/eth/filters/filter_system_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 filters
 
 import (
diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go
index b98945bbd0741a3479ba378ecb3d1dd72537e97f..5954ea4c1f970fcb1e30199e22f2be5e4631c55e 100644
--- a/eth/filters/filter_test.go
+++ b/eth/filters/filter_test.go
@@ -1,3 +1,19 @@
+// 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
+// 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 filters
 
 import (
diff --git a/eth/gpu_mining.go b/eth/gpu_mining.go
index cd734bd3c21871da11bed6a049d484905e231b5b..12fa746018472f099c444d666ca2e6127ec9b2ab 100644
--- a/eth/gpu_mining.go
+++ b/eth/gpu_mining.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/handler_test.go b/eth/handler_test.go
index 8a0dd21b762cfa6261983ff74c0b772d7c03b6dd..76748b6e350949d0a7904aefcb4d0bf0f2d22b1f 100644
--- a/eth/handler_test.go
+++ b/eth/handler_test.go
@@ -1,3 +1,19 @@
+// 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
+// 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 eth
 
 import (
diff --git a/eth/helper_test.go b/eth/helper_test.go
index d6392f531b3e0c82a7d3902c3f6d12f8a376151d..575211a55c7917dcd56375bbb8423232aa776ee0 100644
--- a/eth/helper_test.go
+++ b/eth/helper_test.go
@@ -1,3 +1,19 @@
+// 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
+// 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/jsre/completion.go b/jsre/completion.go
index 7f94dabfcea8789d0f5fbd903ff8c0037743823a..7f484bbbb8b49228467a37931d9b477edd7269ba 100644
--- a/jsre/completion.go
+++ b/jsre/completion.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/jsre/completion_test.go b/jsre/completion_test.go
index 8765281e5e86b234cd41dc0c50b84f7a3158b9f4..92af5ddb64709a5f9f0532768c699aee5ff78e43 100644
--- a/jsre/completion_test.go
+++ b/jsre/completion_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/light/state_object.go b/light/state_object.go
index fbb37400cba3664356daea166f68b0baf42e1acf..030653c77072992f95db2c2a6a77206bc8565191 100644
--- a/light/state_object.go
+++ b/light/state_object.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/node/config.go b/node/config.go
index 23a745c2c3e659c30453773b3d989c0612560df2..bc9fec618cbfcabbf82f05579ac95a6c4f956379 100644
--- a/node/config.go
+++ b/node/config.go
@@ -1,4 +1,4 @@
-// Copyright 2015 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
diff --git a/rlp/decode_tail_test.go b/rlp/decode_tail_test.go
index 8853543905dedd73eb1babe2ec67cb57eca997f7..884c1148b25bf282440e235de6ae8a4e55ceaeae 100644
--- a/rlp/decode_tail_test.go
+++ b/rlp/decode_tail_test.go
@@ -1,3 +1,19 @@
+// 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
+// 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 rlp
 
 import (
diff --git a/rpc/json_test.go b/rpc/json_test.go
index 418b0261d77b7cbd0c2aec7df6436175a77f3259..b095996b824133a6df8bfa49d6210efae40964ae 100644
--- a/rpc/json_test.go
+++ b/rpc/json_test.go
@@ -1,3 +1,19 @@
+// 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
+// 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 rpc
 
 import (
diff --git a/rpc/notification_test.go b/rpc/notification_test.go
index 8d2add81c93caf12a9ee9591f2b99f337bb6791a..cd05d73fe50f8921d859f5ef305a58fa610165ab 100644
--- a/rpc/notification_test.go
+++ b/rpc/notification_test.go
@@ -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 rpc
 
 import (
diff --git a/tests/init.go b/tests/init.go
index caa4eca6cb39c5d225b790d6582022ccfe16563d..c5a05512b7fecb5f09ca2ce3f1bffb8a1ed63c82 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/tests/state_test_util.go b/tests/state_test_util.go
index 9d6069ac70067738cba37cb7ad5793b2753569a2..36fa30881d4300aed3bd7b0fbbbe30a40f9980d9 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/tests/util.go b/tests/util.go
index 9cb43ccb18fcbce3be85185d1cb61ac417869fae..abc67769d6673dae42bd7edee6f344d2ac2e8285 100644
--- a/tests/util.go
+++ b/tests/util.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/tests/vm_test_util.go b/tests/vm_test_util.go
index d17c59905cba1934e649a44c9d99dfc5394942b2..2f516951b85c566758b747e8a1e901b0569508bd 100644
--- a/tests/vm_test_util.go
+++ b/tests/vm_test_util.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/trie/errors.go b/trie/errors.go
index fd0e6f0a9782a65a9131175adc92a3f58f4af713..76129a70bf8e5e94af8af4976890fed23d5feec3 100644
--- a/trie/errors.go
+++ b/trie/errors.go
@@ -1,4 +1,4 @@
-// Copyright 2014 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/trie/proof.go b/trie/proof.go
index 0f926494248bdf71fa137f08e1911a409e6939e4..37a70fb34d29150b808c4859ced9fade594f787c 100644
--- a/trie/proof.go
+++ b/trie/proof.go
@@ -1,3 +1,19 @@
+// 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
+// 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 trie
 
 import (
diff --git a/trie/proof_test.go b/trie/proof_test.go
index 6b5bef05c43fe03eaaf150881c03c22d4df468cb..5668d6562df45189e775ba1442ebb6d0da18eaa4 100644
--- a/trie/proof_test.go
+++ b/trie/proof_test.go
@@ -1,3 +1,19 @@
+// 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
+// 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 trie
 
 import (
diff --git a/whisper/api.go b/whisper/api.go
index 1b82ea3c050b1ed02e7b71acb539b1eecc39c857..d1f454a1faf980a40ca10ca1ce330cc54f5c9ae1 100644
--- a/whisper/api.go
+++ b/whisper/api.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 whisper