diff --git a/CONTRIBUTORS b/AUTHORS
similarity index 91%
rename from CONTRIBUTORS
rename to AUTHORS
index ef8a08d0f..1d3b94ff5 100644
--- a/CONTRIBUTORS
+++ b/AUTHORS
@@ -1,3 +1,5 @@
+# This is the official list of Syncthing authors for copyright purposes.
+
 Aaron Bieber <qbit@deftly.net>
 Alexander Graf <register-github@alex-graf.de>
 Andrew Dunham <andrew@du.nham.ca>
@@ -12,6 +14,7 @@ Emil Hessman <emil@hessman.se>
 Felix Ableitner <me@nutomic.com>
 Felix Unterpaintner <bigbear2nd@gmail.com>
 Gilli Sigurdsson <gilli@vx.is>
+Jakob Borg <jakob@nym.se>
 James Patterson <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
 Jens Diemer <github.com@jensdiemer.de> <git@jensdiemer.de>
 Jochen Voss <voss@seehuhn.de>
diff --git a/build.go b/build.go
index 51ee5e4ea..6219bfe32 100644
--- a/build.go
+++ b/build.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/check-contrib.sh b/check-contrib.sh
index 853f15c54..4bab2f12b 100755
--- a/check-contrib.sh
+++ b/check-contrib.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 missing-contribs() {
-	for email in $(git log --format=%ae master | grep -v jakob@nym.se | sort | uniq) ; do
-		grep -q "$email" CONTRIBUTORS || echo $email
+	for email in $(git log --format=%ae master | sort | uniq) ; do
+		grep -q "$email" AUTHORS || echo $email
 	done
 }
 
diff --git a/cmd/genassets/main.go b/cmd/genassets/main.go
index 87a6cf471..71407c497 100644
--- a/cmd/genassets/main.go
+++ b/cmd/genassets/main.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/stevents/main.go b/cmd/stevents/main.go
index c20acbf56..ad76ccdc9 100644
--- a/cmd/stevents/main.go
+++ b/cmd/stevents/main.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/stindex/main.go b/cmd/stindex/main.go
index 56c99af9b..017150922 100644
--- a/cmd/stindex/main.go
+++ b/cmd/stindex/main.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/debug.go b/cmd/syncthing/debug.go
index 61598ba51..d663d921e 100644
--- a/cmd/syncthing/debug.go
+++ b/cmd/syncthing/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go
index c51e4487e..b324682d5 100644
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/gui_auth.go b/cmd/syncthing/gui_auth.go
index b380c3b33..410516799 100755
--- a/cmd/syncthing/gui_auth.go
+++ b/cmd/syncthing/gui_auth.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/gui_csrf.go b/cmd/syncthing/gui_csrf.go
index 334f64629..7f32e705c 100644
--- a/cmd/syncthing/gui_csrf.go
+++ b/cmd/syncthing/gui_csrf.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/gui_solaris.go b/cmd/syncthing/gui_solaris.go
index c65ea9ab1..4248283ed 100644
--- a/cmd/syncthing/gui_solaris.go
+++ b/cmd/syncthing/gui_solaris.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/gui_unix.go b/cmd/syncthing/gui_unix.go
index d514d4c6b..aeb5847f2 100644
--- a/cmd/syncthing/gui_unix.go
+++ b/cmd/syncthing/gui_unix.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/gui_windows.go b/cmd/syncthing/gui_windows.go
index 2d8c47c83..8f4e5cb13 100755
--- a/cmd/syncthing/gui_windows.go
+++ b/cmd/syncthing/gui_windows.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/heapprof.go b/cmd/syncthing/heapprof.go
index 277b136d4..300951d16 100644
--- a/cmd/syncthing/heapprof.go
+++ b/cmd/syncthing/heapprof.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/limitedreader.go b/cmd/syncthing/limitedreader.go
index fd80dae40..45b514ceb 100644
--- a/cmd/syncthing/limitedreader.go
+++ b/cmd/syncthing/limitedreader.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/limitedwriter.go b/cmd/syncthing/limitedwriter.go
index d0ba5519b..ee2cde2fb 100644
--- a/cmd/syncthing/limitedwriter.go
+++ b/cmd/syncthing/limitedwriter.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index 6618a9b9e..5e15a77b7 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/main_test.go b/cmd/syncthing/main_test.go
index b3df6da03..3d7a49ca5 100644
--- a/cmd/syncthing/main_test.go
+++ b/cmd/syncthing/main_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/memsize_darwin.go b/cmd/syncthing/memsize_darwin.go
index f0389d870..f9978df9d 100644
--- a/cmd/syncthing/memsize_darwin.go
+++ b/cmd/syncthing/memsize_darwin.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/memsize_linux.go b/cmd/syncthing/memsize_linux.go
index 70092cc7b..57023d11e 100644
--- a/cmd/syncthing/memsize_linux.go
+++ b/cmd/syncthing/memsize_linux.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/memsize_solaris.go b/cmd/syncthing/memsize_solaris.go
index 1f494abab..19a24b1e6 100644
--- a/cmd/syncthing/memsize_solaris.go
+++ b/cmd/syncthing/memsize_solaris.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/memsize_unimpl.go b/cmd/syncthing/memsize_unimpl.go
index 05b0c2d69..556c3c077 100644
--- a/cmd/syncthing/memsize_unimpl.go
+++ b/cmd/syncthing/memsize_unimpl.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/memsize_windows.go b/cmd/syncthing/memsize_windows.go
index 2277bd7ff..4058e17a0 100644
--- a/cmd/syncthing/memsize_windows.go
+++ b/cmd/syncthing/memsize_windows.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/monitor.go b/cmd/syncthing/monitor.go
index d48b4506b..7a443e52a 100644
--- a/cmd/syncthing/monitor.go
+++ b/cmd/syncthing/monitor.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/openurl_unix.go b/cmd/syncthing/openurl_unix.go
index 8f178be79..2c5c26679 100644
--- a/cmd/syncthing/openurl_unix.go
+++ b/cmd/syncthing/openurl_unix.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/openurl_windows.go b/cmd/syncthing/openurl_windows.go
index d2028fe1c..ba22f67cd 100644
--- a/cmd/syncthing/openurl_windows.go
+++ b/cmd/syncthing/openurl_windows.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/perfstats_unix.go b/cmd/syncthing/perfstats_unix.go
index 808991b36..12c135b2d 100644
--- a/cmd/syncthing/perfstats_unix.go
+++ b/cmd/syncthing/perfstats_unix.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/tls.go b/cmd/syncthing/tls.go
index d44cebab0..bd8bb126e 100644
--- a/cmd/syncthing/tls.go
+++ b/cmd/syncthing/tls.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/usage.go b/cmd/syncthing/usage.go
index 6190e658e..c9916dae7 100644
--- a/cmd/syncthing/usage.go
+++ b/cmd/syncthing/usage.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/syncthing/usage_report.go b/cmd/syncthing/usage_report.go
index fbbda1816..63c302ea4 100644
--- a/cmd/syncthing/usage_report.go
+++ b/cmd/syncthing/usage_report.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/todos/main.go b/cmd/todos/main.go
index c919f89ce..ec3295bc1 100644
--- a/cmd/todos/main.go
+++ b/cmd/todos/main.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/transifexdl/main.go b/cmd/transifexdl/main.go
index b416ee902..51679426a 100644
--- a/cmd/transifexdl/main.go
+++ b/cmd/transifexdl/main.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/cmd/translate/main.go b/cmd/translate/main.go
index 88000066f..000b750f2 100644
--- a/cmd/translate/main.go
+++ b/cmd/translate/main.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/gui/app.js b/gui/app.js
index 716f4e0f4..a3329fae9 100644
--- a/gui/app.js
+++ b/gui/app.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/gui/index.html b/gui/index.html
index c654cdff3..b6d0e926f 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/gui/modal.html b/gui/modal.html
index 11b006301..fb6ecb90a 100644
--- a/gui/modal.html
+++ b/gui/modal.html
@@ -1,6 +1,6 @@
 <div class="modal fade" tabindex="-1" ng-attr-data-backdrop="{{ close ? true : 'static' }}" ng-attr-data-keyboard="{{ Boolean(close) }}">
   <!--
-  // Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+  // Copyright (C) 2014 The Syncthing Authors.
   //
   // This program is free software: you can redistribute it and/or modify it
   // under the terms of the GNU General Public License as published by the Free
diff --git a/gui/overrides.css b/gui/overrides.css
index 6b094a19a..e641078c4 100644
--- a/gui/overrides.css
+++ b/gui/overrides.css
@@ -1,5 +1,5 @@
 /*
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/auto/auto_test.go b/internal/auto/auto_test.go
index c353ff1a1..19a471e81 100644
--- a/internal/auto/auto_test.go
+++ b/internal/auto/auto_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/auto/doc.go b/internal/auto/doc.go
index cc9d40216..a8a779192 100644
--- a/internal/auto/doc.go
+++ b/internal/auto/doc.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/beacon/beacon.go b/internal/beacon/beacon.go
index cd3cbd053..9c1a201a0 100644
--- a/internal/beacon/beacon.go
+++ b/internal/beacon/beacon.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/beacon/broadcast.go b/internal/beacon/broadcast.go
index c8fa74322..5939c03ae 100644
--- a/internal/beacon/broadcast.go
+++ b/internal/beacon/broadcast.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/beacon/broadcast_test.go b/internal/beacon/broadcast_test.go
index 964c263c3..5cec38bbf 100644
--- a/internal/beacon/broadcast_test.go
+++ b/internal/beacon/broadcast_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/beacon/debug.go b/internal/beacon/debug.go
index 2295a2e21..36e792208 100644
--- a/internal/beacon/debug.go
+++ b/internal/beacon/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/beacon/doc.go b/internal/beacon/doc.go
index 3c32ab83c..f1acb2e48 100644
--- a/internal/beacon/doc.go
+++ b/internal/beacon/doc.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/beacon/multicast.go b/internal/beacon/multicast.go
index 160becf25..f439ccfb2 100644
--- a/internal/beacon/multicast.go
+++ b/internal/beacon/multicast.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/config/config.go b/internal/config/config.go
index c036995b0..8f517472e 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index ae2ddf19e..85a85e431 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/config/wrapper.go b/internal/config/wrapper.go
index b5070789b..66d17d7b5 100644
--- a/internal/config/wrapper.go
+++ b/internal/config/wrapper.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/discover/debug.go b/internal/discover/debug.go
index 61b779845..8b5c08528 100644
--- a/internal/discover/debug.go
+++ b/internal/discover/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/discover/discover.go b/internal/discover/discover.go
index 71f2c500c..acee08f2c 100644
--- a/internal/discover/discover.go
+++ b/internal/discover/discover.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/discover/discover_test.go b/internal/discover/discover_test.go
index ba56e2a96..f2b69f580 100644
--- a/internal/discover/discover_test.go
+++ b/internal/discover/discover_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/discover/doc.go b/internal/discover/doc.go
index 5a4fd009a..c9e7d97d3 100644
--- a/internal/discover/doc.go
+++ b/internal/discover/doc.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/discover/packets.go b/internal/discover/packets.go
index eb39e3f99..85cf13b66 100644
--- a/internal/discover/packets.go
+++ b/internal/discover/packets.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/events/debug.go b/internal/events/debug.go
index 441036314..ba54049fd 100644
--- a/internal/events/debug.go
+++ b/internal/events/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/events/events.go b/internal/events/events.go
index 23f1811f4..0d26074a1 100644
--- a/internal/events/events.go
+++ b/internal/events/events.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/events/events_test.go b/internal/events/events_test.go
index 0970b5a31..3389fc8ea 100644
--- a/internal/events/events_test.go
+++ b/internal/events/events_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/files/blockmap.go b/internal/files/blockmap.go
index d678eda11..d47fe9db2 100644
--- a/internal/files/blockmap.go
+++ b/internal/files/blockmap.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/files/blockmap_test.go b/internal/files/blockmap_test.go
index 57963986f..ff54b7fac 100644
--- a/internal/files/blockmap_test.go
+++ b/internal/files/blockmap_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/files/concurrency_test.go b/internal/files/concurrency_test.go
index fb815c16d..d8cc922ad 100644
--- a/internal/files/concurrency_test.go
+++ b/internal/files/concurrency_test.go
@@ -1,3 +1,18 @@
+// Copyright (C) 2014 The Syncthing Authors.
+//
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation, either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package files_test
 
 import (
diff --git a/internal/files/debug.go b/internal/files/debug.go
index 3a1043cc7..94dbfc242 100644
--- a/internal/files/debug.go
+++ b/internal/files/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/files/filenames_darwin.go b/internal/files/filenames_darwin.go
index 2cc3cd806..4d2559cc7 100644
--- a/internal/files/filenames_darwin.go
+++ b/internal/files/filenames_darwin.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/files/filenames_unix.go b/internal/files/filenames_unix.go
index 685925c8a..573069c17 100644
--- a/internal/files/filenames_unix.go
+++ b/internal/files/filenames_unix.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/files/filenames_windows.go b/internal/files/filenames_windows.go
index 9c328a2e9..34a37a9ea 100644
--- a/internal/files/filenames_windows.go
+++ b/internal/files/filenames_windows.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/files/leveldb.go b/internal/files/leveldb.go
index 16d8a1e72..1fba0598b 100644
--- a/internal/files/leveldb.go
+++ b/internal/files/leveldb.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/files/leveldb_test.go b/internal/files/leveldb_test.go
index dafbf9395..e35251109 100644
--- a/internal/files/leveldb_test.go
+++ b/internal/files/leveldb_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/files/set.go b/internal/files/set.go
index fd0d2152e..01cc517c0 100644
--- a/internal/files/set.go
+++ b/internal/files/set.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/files/set_test.go b/internal/files/set_test.go
index 6dfdb0eeb..1861f40c7 100644
--- a/internal/files/set_test.go
+++ b/internal/files/set_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/fnmatch/fnmatch.go b/internal/fnmatch/fnmatch.go
index 9507cc951..db87e1d13 100644
--- a/internal/fnmatch/fnmatch.go
+++ b/internal/fnmatch/fnmatch.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/fnmatch/fnmatch_test.go b/internal/fnmatch/fnmatch_test.go
index e83542671..1a7fead77 100644
--- a/internal/fnmatch/fnmatch_test.go
+++ b/internal/fnmatch/fnmatch_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/ignore/ignore.go b/internal/ignore/ignore.go
index 69357673b..16ce956e7 100644
--- a/internal/ignore/ignore.go
+++ b/internal/ignore/ignore.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/ignore/ignore_test.go b/internal/ignore/ignore_test.go
index b1eb29e16..a4b0aadb1 100644
--- a/internal/ignore/ignore_test.go
+++ b/internal/ignore/ignore_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/lamport/clock.go b/internal/lamport/clock.go
index afd732845..6a3e7c51a 100644
--- a/internal/lamport/clock.go
+++ b/internal/lamport/clock.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/lamport/clock_test.go b/internal/lamport/clock_test.go
index f0e37254b..ded50742a 100644
--- a/internal/lamport/clock_test.go
+++ b/internal/lamport/clock_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/luhn/luhn.go b/internal/luhn/luhn.go
index 453c6ef42..7264835e2 100644
--- a/internal/luhn/luhn.go
+++ b/internal/luhn/luhn.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/luhn/luhn_test.go b/internal/luhn/luhn_test.go
index 87e598266..bdce8c5f1 100644
--- a/internal/luhn/luhn_test.go
+++ b/internal/luhn/luhn_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/debug.go b/internal/model/debug.go
index 533fd6abc..dc6dd8e50 100644
--- a/internal/model/debug.go
+++ b/internal/model/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/deviceactivity.go b/internal/model/deviceactivity.go
index ee1e487bc..b94f1ec91 100644
--- a/internal/model/deviceactivity.go
+++ b/internal/model/deviceactivity.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/deviceactivity_test.go b/internal/model/deviceactivity_test.go
index e2c4d702d..7d4ed2c92 100644
--- a/internal/model/deviceactivity_test.go
+++ b/internal/model/deviceactivity_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/doc.go b/internal/model/doc.go
index 42f0ac2af..aa3890925 100644
--- a/internal/model/doc.go
+++ b/internal/model/doc.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/model.go b/internal/model/model.go
index 8623358e5..2927490e8 100644
--- a/internal/model/model.go
+++ b/internal/model/model.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/model_test.go b/internal/model/model_test.go
index c6b92f597..68b328bd8 100644
--- a/internal/model/model_test.go
+++ b/internal/model/model_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/puller.go b/internal/model/puller.go
index 4ea12a411..976995b52 100644
--- a/internal/model/puller.go
+++ b/internal/model/puller.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/puller_test.go b/internal/model/puller_test.go
index 77b761275..2481f8873 100644
--- a/internal/model/puller_test.go
+++ b/internal/model/puller_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/scanner.go b/internal/model/scanner.go
index 97281aa56..98c1fc2d9 100644
--- a/internal/model/scanner.go
+++ b/internal/model/scanner.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/sharedpullerstate.go b/internal/model/sharedpullerstate.go
index 9256e41cd..3eab3773f 100644
--- a/internal/model/sharedpullerstate.go
+++ b/internal/model/sharedpullerstate.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/sharedpullerstate_test.go b/internal/model/sharedpullerstate_test.go
index 9906ff1a6..c12e84a93 100644
--- a/internal/model/sharedpullerstate_test.go
+++ b/internal/model/sharedpullerstate_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/tempname.go b/internal/model/tempname.go
index a58d15c14..13d7aaaef 100644
--- a/internal/model/tempname.go
+++ b/internal/model/tempname.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/tempname_windows.go b/internal/model/tempname_windows.go
index aee1c3566..233bdfe27 100644
--- a/internal/model/tempname_windows.go
+++ b/internal/model/tempname_windows.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/model/util.go b/internal/model/util.go
index d8b0bdb6c..875142f08 100644
--- a/internal/model/util.go
+++ b/internal/model/util.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/osutil/hidden_unix.go b/internal/osutil/hidden_unix.go
index 932242c74..b158f73d0 100644
--- a/internal/osutil/hidden_unix.go
+++ b/internal/osutil/hidden_unix.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/osutil/hidden_windows.go b/internal/osutil/hidden_windows.go
index a4cd2f39d..02a58af0a 100644
--- a/internal/osutil/hidden_windows.go
+++ b/internal/osutil/hidden_windows.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/osutil/osutil.go b/internal/osutil/osutil.go
index 66dfd4f91..023dc8b09 100644
--- a/internal/osutil/osutil.go
+++ b/internal/osutil/osutil.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/osutil/osutil_test.go b/internal/osutil/osutil_test.go
index 54882c8da..74abd1f8d 100644
--- a/internal/osutil/osutil_test.go
+++ b/internal/osutil/osutil_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/osutil/replacingwriter.go b/internal/osutil/replacingwriter.go
index 4eac59083..b9f25e950 100644
--- a/internal/osutil/replacingwriter.go
+++ b/internal/osutil/replacingwriter.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/osutil/replacingwriter_test.go b/internal/osutil/replacingwriter_test.go
index c2332063a..15754b87f 100644
--- a/internal/osutil/replacingwriter_test.go
+++ b/internal/osutil/replacingwriter_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/common_test.go b/internal/protocol/common_test.go
index 29b910bab..e38da00a8 100644
--- a/internal/protocol/common_test.go
+++ b/internal/protocol/common_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/counting.go b/internal/protocol/counting.go
index 4f95c9f9a..ac4aeaa9a 100644
--- a/internal/protocol/counting.go
+++ b/internal/protocol/counting.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/debug.go b/internal/protocol/debug.go
index c46f4a984..4664b0e23 100644
--- a/internal/protocol/debug.go
+++ b/internal/protocol/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/deviceid.go b/internal/protocol/deviceid.go
index 4b034f3f1..93753d7fa 100644
--- a/internal/protocol/deviceid.go
+++ b/internal/protocol/deviceid.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/deviceid_test.go b/internal/protocol/deviceid_test.go
index 14e2dfa34..da398c6fb 100644
--- a/internal/protocol/deviceid_test.go
+++ b/internal/protocol/deviceid_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/doc.go b/internal/protocol/doc.go
index 95b5e102f..4f73e6c86 100644
--- a/internal/protocol/doc.go
+++ b/internal/protocol/doc.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/header.go b/internal/protocol/header.go
index 96ccff66f..8da092e5c 100644
--- a/internal/protocol/header.go
+++ b/internal/protocol/header.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/message.go b/internal/protocol/message.go
index 445ac7a75..eff837fe1 100644
--- a/internal/protocol/message.go
+++ b/internal/protocol/message.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/nativemodel_darwin.go b/internal/protocol/nativemodel_darwin.go
index 7fb5c964e..8b2b842a4 100644
--- a/internal/protocol/nativemodel_darwin.go
+++ b/internal/protocol/nativemodel_darwin.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/nativemodel_unix.go b/internal/protocol/nativemodel_unix.go
index 61ad9c438..bf6499e63 100644
--- a/internal/protocol/nativemodel_unix.go
+++ b/internal/protocol/nativemodel_unix.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/nativemodel_windows.go b/internal/protocol/nativemodel_windows.go
index 57d3f3446..d2c079bdc 100644
--- a/internal/protocol/nativemodel_windows.go
+++ b/internal/protocol/nativemodel_windows.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/protocol.go b/internal/protocol/protocol.go
index 08ef226f0..ae7f480b3 100644
--- a/internal/protocol/protocol.go
+++ b/internal/protocol/protocol.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/protocol_test.go b/internal/protocol/protocol_test.go
index a7bb1416c..9da9422c1 100644
--- a/internal/protocol/protocol_test.go
+++ b/internal/protocol/protocol_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/protocol/wireformat.go b/internal/protocol/wireformat.go
index f06b9454e..b7f4e367d 100644
--- a/internal/protocol/wireformat.go
+++ b/internal/protocol/wireformat.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/scanner/blockqueue.go b/internal/scanner/blockqueue.go
index 4ce67b86a..9d75dac75 100644
--- a/internal/scanner/blockqueue.go
+++ b/internal/scanner/blockqueue.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/scanner/blocks.go b/internal/scanner/blocks.go
index 8360fcf2d..825c12508 100644
--- a/internal/scanner/blocks.go
+++ b/internal/scanner/blocks.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/scanner/blocks_test.go b/internal/scanner/blocks_test.go
index 75dd42fb2..728e46c2b 100644
--- a/internal/scanner/blocks_test.go
+++ b/internal/scanner/blocks_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/scanner/debug.go b/internal/scanner/debug.go
index bffd48cbf..7f2df444d 100644
--- a/internal/scanner/debug.go
+++ b/internal/scanner/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/scanner/doc.go b/internal/scanner/doc.go
index c2c98352e..2ba00dc2f 100644
--- a/internal/scanner/doc.go
+++ b/internal/scanner/doc.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/scanner/walk.go b/internal/scanner/walk.go
index 93d5c868a..927a41e87 100644
--- a/internal/scanner/walk.go
+++ b/internal/scanner/walk.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/scanner/walk_test.go b/internal/scanner/walk_test.go
index d7e367dc3..13cc45c7c 100644
--- a/internal/scanner/walk_test.go
+++ b/internal/scanner/walk_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/stats/debug.go b/internal/stats/debug.go
index 7e0608ef8..72853b9d3 100755
--- a/internal/stats/debug.go
+++ b/internal/stats/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/stats/device.go b/internal/stats/device.go
index df98a1da0..408468283 100755
--- a/internal/stats/device.go
+++ b/internal/stats/device.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/stats/leveldb.go b/internal/stats/leveldb.go
index edbe8c6c2..e613c17f2 100755
--- a/internal/stats/leveldb.go
+++ b/internal/stats/leveldb.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/upgrade/debug.go b/internal/upgrade/debug.go
index c7406c07c..f785b39c5 100644
--- a/internal/upgrade/debug.go
+++ b/internal/upgrade/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/upgrade/upgrade_common.go b/internal/upgrade/upgrade_common.go
index 6aaf3da27..6dffe1605 100644
--- a/internal/upgrade/upgrade_common.go
+++ b/internal/upgrade/upgrade_common.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/upgrade/upgrade_supported.go b/internal/upgrade/upgrade_supported.go
index a6af79b11..1616f3798 100644
--- a/internal/upgrade/upgrade_supported.go
+++ b/internal/upgrade/upgrade_supported.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/upgrade/upgrade_test.go b/internal/upgrade/upgrade_test.go
index 8602de0e1..b625d4665 100644
--- a/internal/upgrade/upgrade_test.go
+++ b/internal/upgrade/upgrade_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/upgrade/upgrade_unsupp.go b/internal/upgrade/upgrade_unsupp.go
index cf4485096..444089ed7 100644
--- a/internal/upgrade/upgrade_unsupp.go
+++ b/internal/upgrade/upgrade_unsupp.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/upgrade/upgrade_windows.go b/internal/upgrade/upgrade_windows.go
index 43d243bc6..d30c6e493 100755
--- a/internal/upgrade/upgrade_windows.go
+++ b/internal/upgrade/upgrade_windows.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/upnp/debug.go b/internal/upnp/debug.go
index 9a339d198..47bbe0753 100644
--- a/internal/upnp/debug.go
+++ b/internal/upnp/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/upnp/upnp.go b/internal/upnp/upnp.go
index 8e7e16b32..c1d9786f9 100644
--- a/internal/upnp/upnp.go
+++ b/internal/upnp/upnp.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/upnp/upnp_test.go b/internal/upnp/upnp_test.go
index e3bf6becd..2023b708f 100644
--- a/internal/upnp/upnp_test.go
+++ b/internal/upnp/upnp_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/versioner/debug.go b/internal/versioner/debug.go
index 556094e6a..caae94bd0 100644
--- a/internal/versioner/debug.go
+++ b/internal/versioner/debug.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/versioner/simple.go b/internal/versioner/simple.go
index 858485a83..0960f11a8 100644
--- a/internal/versioner/simple.go
+++ b/internal/versioner/simple.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/versioner/staggered.go b/internal/versioner/staggered.go
index eb3947745..7c5070520 100644
--- a/internal/versioner/staggered.go
+++ b/internal/versioner/staggered.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
@@ -124,10 +124,10 @@ func NewStaggered(folderID, folderPath string, params map[string]string) Version
 		cleanInterval: cleanInterval,
 		folderPath:    folderPath,
 		interval: [4]Interval{
-			{30, 3600},               // first hour -> 30 sec between versions
-			{3600, 86400},            // next day -> 1 h between versions
-			{86400, 592000},          // next 30 days -> 1 day between versions
-			{604800, maxAge},         // next year -> 1 week between versions
+			{30, 3600},       // first hour -> 30 sec between versions
+			{3600, 86400},    // next day -> 1 h between versions
+			{86400, 592000},  // next 30 days -> 1 day between versions
+			{604800, maxAge}, // next year -> 1 week between versions
 		},
 		mutex: &mutex,
 	}
diff --git a/internal/versioner/versioner.go b/internal/versioner/versioner.go
index 9d4079a19..8a663a527 100644
--- a/internal/versioner/versioner.go
+++ b/internal/versioner/versioner.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/internal/versioner/versioner_test.go b/internal/versioner/versioner_test.go
index 921e49f35..d44205516 100644
--- a/internal/versioner/versioner_test.go
+++ b/internal/versioner/versioner_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/test/common_test.go b/test/common_test.go
index c93b203ff..b5fc6a16c 100644
--- a/test/common_test.go
+++ b/test/common_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/test/genfiles.go b/test/genfiles.go
index 6191bd142..79f5b9729 100644
--- a/test/genfiles.go
+++ b/test/genfiles.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/test/http_test.go b/test/http_test.go
index f436efde7..5be425186 100644
--- a/test/http_test.go
+++ b/test/http_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/test/httpstress_test.go b/test/httpstress_test.go
index 61529a8a6..e42fd1f24 100644
--- a/test/httpstress_test.go
+++ b/test/httpstress_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/test/json.go b/test/json.go
index 8bfdd9460..00e1291a1 100644
--- a/test/json.go
+++ b/test/json.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/test/manypeers_test.go b/test/manypeers_test.go
index 7474de7a2..612a8619c 100644
--- a/test/manypeers_test.go
+++ b/test/manypeers_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/test/md5r.go b/test/md5r.go
index 3b31462fd..3d091b21e 100644
--- a/test/md5r.go
+++ b/test/md5r.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/test/reconnect_test.go b/test/reconnect_test.go
index 1bd49ae4e..8750fab9f 100644
--- a/test/reconnect_test.go
+++ b/test/reconnect_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
diff --git a/test/test-delupd.sh b/test/test-delupd.sh
index 25ecc6286..6c99edb96 100755
--- a/test/test-delupd.sh
+++ b/test/test-delupd.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-# Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+# Copyright (C) 2014 The Syncthing Authors.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
diff --git a/test/test-folders.sh b/test/test-folders.sh
index 395832e5c..959736646 100755
--- a/test/test-folders.sh
+++ b/test/test-folders.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-# Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+# Copyright (C) 2014 The Syncthing Authors.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
diff --git a/test/test-merge.sh b/test/test-merge.sh
index cf1bef64a..02fb37cba 100755
--- a/test/test-merge.sh
+++ b/test/test-merge.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-# Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+# Copyright (C) 2014 The Syncthing Authors.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
diff --git a/test/transfer-bench_test.go b/test/transfer-bench_test.go
index 65f89b3d3..f78ea1ff8 100644
--- a/test/transfer-bench_test.go
+++ b/test/transfer-bench_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// Copyright (C) 2014 The Syncthing Authors.
 //
 // This program is free software: you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free