diff --git a/AUTHORS b/AUTHORS
index 46f0ed50bd..44502489c4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,6 +29,7 @@ Jordan Crouse
 Kshitij
 Lei Wen
 Libra Li
+Linus Torvalds
 Marek Vasut
 Marius Gröger
 Marvell Semiconductor Inc
@@ -44,6 +45,7 @@ Ronald G. Minnich
 Rudolf Marek
 Russell King
 Sage Electronic Engineering, LLC
+secunet Security Networks AG
 Siemens AG
 Stefan Reinauer
 Steve Magnani
@@ -61,3 +63,4 @@ Wolfgang Denk
 src/acpi
 src/arch
 src/commonlib
+src/console
diff --git a/src/console/console.c b/src/console/console.c
index 50ee5c30e5..a36cb96ed1 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -1,8 +1,6 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2003 Eric Biederman
- *
  * 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; version 2 of the License.
diff --git a/src/console/die.c b/src/console/die.c
index 3a17126264..76c456d1fb 100644
--- a/src/console/die.c
+++ b/src/console/die.c
@@ -1,8 +1,6 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2003 Eric Biederman
- *
  * 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; version 2 of
diff --git a/src/console/hw-debug_sink.adb b/src/console/hw-debug_sink.adb
index 4331b87549..78359cd50b 100644
--- a/src/console/hw-debug_sink.adb
+++ b/src/console/hw-debug_sink.adb
@@ -1,8 +1,6 @@
 --
 -- This file is part of the coreboot project.
 --
--- Copyright (C) 2015 secunet Security Networks AG
---
 -- 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; version 2 of the License.
diff --git a/src/console/hw-debug_sink.ads b/src/console/hw-debug_sink.ads
index 322249e1cb..8598966f0c 100644
--- a/src/console/hw-debug_sink.ads
+++ b/src/console/hw-debug_sink.ads
@@ -1,8 +1,6 @@
 --
 -- This file is part of the coreboot project.
 --
--- Copyright (C) 2015 secunet Security Networks AG
---
 -- 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; version 2 of the License.
diff --git a/src/console/init.c b/src/console/init.c
index 43b499d816..4859980647 100644
--- a/src/console/init.c
+++ b/src/console/init.c
@@ -1,8 +1,6 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2003 Eric Biederman
- *
  * 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; version 2 of
diff --git a/src/console/post.c b/src/console/post.c
index 0719e5e7df..64aa2a5513 100644
--- a/src/console/post.c
+++ b/src/console/post.c
@@ -1,8 +1,6 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2003 Eric Biederman
- *
  * 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; version 2 of
diff --git a/src/console/printk.c b/src/console/printk.c
index 1165226b2a..15c599dce0 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -1,10 +1,6 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 1991, 1992  Linus Torvalds
- * Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>,
- *               Raptor Engineering
- *
  * 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; version 2 of the License.
diff --git a/src/console/vsprintf.c b/src/console/vsprintf.c
index 4892fdd1ff..78bc09f5a7 100644
--- a/src/console/vsprintf.c
+++ b/src/console/vsprintf.c
@@ -1,8 +1,6 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2009 coresystems GmbH
- *
  * 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; version 2 of
diff --git a/src/console/vtxprintf.c b/src/console/vtxprintf.c
index f34c91bb5f..1efe55a332 100644
--- a/src/console/vtxprintf.c
+++ b/src/console/vtxprintf.c
@@ -1,8 +1,6 @@
 /*
  * This file is part of the coreboot project.
  *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- *
  * 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; version 2 of the License.