diff --git a/AUTHORS b/AUTHORS
index ac4dc747621338a4e9bf8ec97b0b5a13c0de8f4f..d6ad962115e86e61aaf6c02b68dc00d4bb2d3962 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,12 +1,6 @@
-# This is the official list of scrambler-plugin authors for copyright purposes.
-# This file is distinct from the CONTRIBUTORS files.
-# See the latter for an explanation.
-
-# Names should be added to this file as
-# Name or Organization <email address>
-# The email address is not required for organizations.
-
-# Please keep the list sorted.
+# This is the official list of scrambler-plugin authors for copyright
+# purposes. It lists the individuals that are part of the "scrambler-plugin
+# authors" group that you will find in every code file in src/.
 
 Posteo e.K. <opensource@posteo.de>
 simia.tech GbR <info@simiatech.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
deleted file mode 100644
index 38b741f059c7a6172a2144790c426bc3a0d289d5..0000000000000000000000000000000000000000
--- a/CONTRIBUTORS
+++ /dev/null
@@ -1,4 +0,0 @@
-# Please add yourself here if you have done a contribution
-# for the source code.
-# Please use the format: Name <your@email.com>
-# The list should ordered in alphabetical order.
diff --git a/src/scrambler-common.c b/src/scrambler-common.c
index b5a34a2d23ca0d2081d35bfed4d3036b2c5af9b1..4b0d1cc8adda9dbc487104dc2ed6b4b063ce2ead 100644
--- a/src/scrambler-common.c
+++ b/src/scrambler-common.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2014-2015 The scrambler-plugin authors. All rights reserved.
+ * Copyright (c) 2014-2015 - The scrambler-plugin authors.
+ *                    2017 - David Goulet <dgoulet@riseup.net>
  *
  * On 30.4.2015 - or earlier on notice - the scrambler-plugin authors will
  * make this source code available under the terms of the GNU Affero General
diff --git a/src/scrambler-common.h b/src/scrambler-common.h
index c19b6db335fde287e39bc92823c34b4d0081836d..b7786c22cc4e99c9ca557b28b4d6d0905b402b5d 100644
--- a/src/scrambler-common.h
+++ b/src/scrambler-common.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2014-2015 The scrambler-plugin authors. All rights reserved.
+ * Copyright (c) 2014-2015 - The scrambler-plugin authors.
+ *                    2017 - David Goulet <dgoulet@riseup.net>
  *
  * On 30.4.2015 - or earlier on notice - the scrambler-plugin authors will
  * make this source code available under the terms of the GNU Affero General
diff --git a/src/scrambler-istream.c b/src/scrambler-istream.c
index 8fa9fe754f972b6da94ed0f05a7e586a192b85e4..6e16c092457a14f7b46ba3474908f6c9f50884fe 100644
--- a/src/scrambler-istream.c
+++ b/src/scrambler-istream.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2014-2015 The scrambler-plugin authors. All rights reserved.
+ * Copyright (c) 2014-2015 - The scrambler-plugin authors.
+ *                    2017 - David Goulet <dgoulet@riseup.net>
  *
  * On 30.4.2015 - or earlier on notice - the scrambler-plugin authors will
  * make this source code available under the terms of the GNU Affero General
diff --git a/src/scrambler-istream.h b/src/scrambler-istream.h
index 379751b3af8a834ece7f6974b00152bde569ddfd..f720d907b6628053936668f7fc83eea3e52e230d 100644
--- a/src/scrambler-istream.h
+++ b/src/scrambler-istream.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2014-2015 The scrambler-plugin authors. All rights reserved.
+ * Copyright (c) 2014-2015 - The scrambler-plugin authors.
+ *                    2017 - David Goulet <dgoulet@riseup.net>
  *
  * On 30.4.2015 - or earlier on notice - the scrambler-plugin authors will
  * make this source code available under the terms of the GNU Affero General
diff --git a/src/scrambler-ostream.c b/src/scrambler-ostream.c
index c331fce02b47dfa5579db9b180fea01fdc3ed9f2..d558dd206c548c13dd2077669d714b8ba3ecf052 100644
--- a/src/scrambler-ostream.c
+++ b/src/scrambler-ostream.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2014-2015 The scrambler-plugin authors. All rights reserved.
+ * Copyright (c) 2014-2015 - The scrambler-plugin authors.
+ *                    2017 - David Goulet <dgoulet@riseup.net>
  *
  * On 30.4.2015 - or earlier on notice - the scrambler-plugin authors will
  * make this source code available under the terms of the GNU Affero General
diff --git a/src/scrambler-ostream.h b/src/scrambler-ostream.h
index 3f93d1cb40260050d78fe5f375873c7dc6f3c12c..90a1aaea8cb33c898abb0861e9f52c026df3d745 100644
--- a/src/scrambler-ostream.h
+++ b/src/scrambler-ostream.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2014-2015 The scrambler-plugin authors. All rights reserved.
+ * Copyright (c) 2014-2015 - The scrambler-plugin authors.
+ *                    2017 - David Goulet <dgoulet@riseup.net>
  *
  * On 30.4.2015 - or earlier on notice - the scrambler-plugin authors will
  * make this source code available under the terms of the GNU Affero General
diff --git a/src/scrambler-plugin.c b/src/scrambler-plugin.c
index f677c2e226fe0111ce8efbe63ec6cdbf4716c935..25cc24b0d29dd042194a4e649090bdba30b1c83e 100644
--- a/src/scrambler-plugin.c
+++ b/src/scrambler-plugin.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2014-2015 The scrambler-plugin authors. All rights reserved.
+ * Copyright (c) 2014-2015 - The scrambler-plugin authors.
+ *                    2017 - David Goulet <dgoulet@riseup.net>
  *
  * On 30.4.2015 - or earlier on notice - the scrambler-plugin authors will
  * make this source code available under the terms of the GNU Affero General
diff --git a/src/scrambler-plugin.h b/src/scrambler-plugin.h
index 270daa904c278e4d98ea2f5f07c38bc1968b899b..c6169df801b6072da0728fd9d118c7b84cd4ba66 100644
--- a/src/scrambler-plugin.h
+++ b/src/scrambler-plugin.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2014-2015 The scrambler-plugin authors. All rights reserved.
+ * Copyright (c) 2014-2015 - The scrambler-plugin authors.
+ *                    2017 - David Goulet <dgoulet@riseup.net>
  *
  * On 30.4.2015 - or earlier on notice - the scrambler-plugin authors will
  * make this source code available under the terms of the GNU Affero General