diff --git a/COPYRIGHT b/COPYRIGHT
index 95c44a8c..35702b10 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -2,5 +2,8 @@ Copyright 2009 The Go Authors. All rights reserved. Use of this source code
 is governed by a BSD-style license that can be found in the LICENSE file.
 Extensions of the original work are copyright (c) 2011 Miek Gieben
 
+Copyright 2011 Miek Gieben. All rights reserved. Use of this source code is
+governed by a BSD-style license that can be found in the LICENSE file.
+
 Copyright 2014 CloudFlare. All rights reserved. Use of this source code is
 governed by a BSD-style license that can be found in the LICENSE file.
diff --git a/client.go b/client.go
index f9bdda8d..ee8e2233 100644
--- a/client.go
+++ b/client.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 // A client implementation.
diff --git a/client_test.go b/client_test.go
index da705c16..9691a9cd 100644
--- a/client_test.go
+++ b/client_test.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/clientconfig.go b/clientconfig.go
index 349d793a..87cf8961 100644
--- a/clientconfig.go
+++ b/clientconfig.go
@@ -1,8 +1,3 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Extensions of the original work are copyright (c) 2011 Miek Gieben
-
 package dns
 
 import (
diff --git a/defaults.go b/defaults.go
index 2ce998d8..f483d4a3 100644
--- a/defaults.go
+++ b/defaults.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/dns.go b/dns.go
index 6b23bccb..7540c0d5 100644
--- a/dns.go
+++ b/dns.go
@@ -1,8 +1,3 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Extensions of the original work are copyright (c) 2011 Miek Gieben
-
 // Package dns implements a full featured interface to the Domain Name System.
 // Server- and client-side programming is supported.
 // The package allows complete control over what is send out to the DNS. The package
diff --git a/dns_test.go b/dns_test.go
index 99d9e09a..fbdcd172 100644
--- a/dns_test.go
+++ b/dns_test.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/dnssec.go b/dnssec.go
index ae6c1b12..db32fe55 100644
--- a/dnssec.go
+++ b/dnssec.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 // DNSSEC
 //
 // DNSSEC (DNS Security Extension) adds a layer of security to the DNS. It
diff --git a/dnssec_test.go b/dnssec_test.go
index 58cbd6d4..484367cf 100644
--- a/dnssec_test.go
+++ b/dnssec_test.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/dyn_test.go b/dyn_test.go
index 3868cb0c..09986a5e 100644
--- a/dyn_test.go
+++ b/dyn_test.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 // Find better solution
diff --git a/edns.go b/edns.go
index 9d752fa8..0a7a1a9d 100644
--- a/edns.go
+++ b/edns.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 // EDNS0
 //
 // EDNS0 is an extension mechanism for the DNS defined in RFC 2671 and updated
diff --git a/example_test.go b/example_test.go
index a0cbfbf1..4bdeaa52 100644
--- a/example_test.go
+++ b/example_test.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/keygen.go b/keygen.go
index a5ef00c8..bc1a0797 100644
--- a/keygen.go
+++ b/keygen.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/kscan.go b/kscan.go
index 0c718486..8cc729ab 100644
--- a/kscan.go
+++ b/kscan.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/labels.go b/labels.go
index 8d93228d..e72d9d49 100644
--- a/labels.go
+++ b/labels.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 // Holds a bunch of helper functions for dealing with labels.
diff --git a/labels_test.go b/labels_test.go
index 90964592..1d8da155 100644
--- a/labels_test.go
+++ b/labels_test.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/msg.go b/msg.go
index d959b30a..94dab22b 100644
--- a/msg.go
+++ b/msg.go
@@ -1,8 +1,3 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Extensions of the original work are copyright (c) 2011 Miek Gieben
-
 // DNS packet assembly, see RFC 1035. Converting from - Unpack() -
 // and to - Pack() - wire format.
 // All the packers and unpackers take a (msg []byte, off int)
diff --git a/nsecx.go b/nsecx.go
index 744ddb49..28bf08d9 100644
--- a/nsecx.go
+++ b/nsecx.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/nsecx_test.go b/nsecx_test.go
index ee1c5ff1..72f641a6 100644
--- a/nsecx_test.go
+++ b/nsecx_test.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/parse_test.go b/parse_test.go
index 2aa53649..d1a5124f 100644
--- a/parse_test.go
+++ b/parse_test.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/rawmsg.go b/rawmsg.go
index 4be3afed..f138b776 100644
--- a/rawmsg.go
+++ b/rawmsg.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 // These raw* functions do not use reflection, they directly set the values
diff --git a/scanner.go b/scanner.go
index 558c1b29..c29bc2f3 100644
--- a/scanner.go
+++ b/scanner.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 // Implement a simple scanner, return a byte stream from an io reader.
diff --git a/server.go b/server.go
index 7047efe4..cf3353bd 100644
--- a/server.go
+++ b/server.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 // DNS server implementation.
 
 package dns
diff --git a/server_test.go b/server_test.go
index 6cf9ffdb..b7430138 100644
--- a/server_test.go
+++ b/server_test.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/tlsa.go b/tlsa.go
index efcb28db..d3bc3b02 100644
--- a/tlsa.go
+++ b/tlsa.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/tsig.go b/tsig.go
index b0262f76..f31b15be 100644
--- a/tsig.go
+++ b/tsig.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 // TRANSACTION SIGNATURE
 //
 // An TSIG or transaction signature adds a HMAC TSIG record to each message sent.
diff --git a/types.go b/types.go
index f91cf5fc..b19ac111 100644
--- a/types.go
+++ b/types.go
@@ -1,8 +1,3 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-// Extensions of the original work are copyright (c) 2011 Miek Gieben
-
 package dns
 
 import (
diff --git a/udp.go b/udp.go
index c5bf33f6..0342543b 100644
--- a/udp.go
+++ b/udp.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 // +build !windows
 
 package dns
diff --git a/udp_linux.go b/udp_linux.go
index aedc7663..7a107857 100644
--- a/udp_linux.go
+++ b/udp_linux.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 // +build linux
 
 package dns
diff --git a/udp_other.go b/udp_other.go
index 2732b0e2..c38dd3e7 100644
--- a/udp_other.go
+++ b/udp_other.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 // +build !linux
 
 package dns
diff --git a/udp_windows.go b/udp_windows.go
index 3612526f..4c48723b 100644
--- a/udp_windows.go
+++ b/udp_windows.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 // +build windows
 
 package dns
diff --git a/update.go b/update.go
index 347dcd04..053e4224 100644
--- a/update.go
+++ b/update.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 // DYNAMIC UPDATES
 //
 // Dynamic updates reuses the DNS message format, but renames three of
diff --git a/xfr.go b/xfr.go
index ad9232c7..57bfb167 100644
--- a/xfr.go
+++ b/xfr.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/zgenerate.go b/zgenerate.go
index 917c4420..7f1183e8 100644
--- a/zgenerate.go
+++ b/zgenerate.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/zscan.go b/zscan.go
index 91df3429..08993343 100644
--- a/zscan.go
+++ b/zscan.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (
diff --git a/zscan_rr.go b/zscan_rr.go
index 55814e07..b6baff13 100644
--- a/zscan_rr.go
+++ b/zscan_rr.go
@@ -1,7 +1,3 @@
-// Copyright 2011 Miek Gieben. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 package dns
 
 import (