diff --git a/include/math/box2.h b/include/math/box2.h
index 470fa6ac88..d52b79b69b 100644
--- a/include/math/box2.h
+++ b/include/math/box2.h
@@ -1,10 +1,11 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
- * Copyright (C) 2008-2011 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2010 Virtenio GmbH, Torsten Hueter, torsten.hueter <at> virtenio.de
+ * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
+ * Copyright (C) 2012 Kicad Developers, see change_log.txt for contributors.
  * Copyright (C) 2013 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/include/math/math_util.h b/include/math/math_util.h
index 3a4049ae29..2a3ff3fa17 100644
--- a/include/math/math_util.h
+++ b/include/math/math_util.h
@@ -2,7 +2,8 @@
  * This program source code file is part of KICAD, a free EDA CAD application.
  *
  * Copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (C) 2013 Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ * Copyright (C) CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/include/math/vector2d.h b/include/math/vector2d.h
index 583043f5b5..675e74d15f 100644
--- a/include/math/vector2d.h
+++ b/include/math/vector2d.h
@@ -4,7 +4,8 @@
  * Copyright (C) 2010 Virtenio GmbH, Torsten Hueter, torsten.hueter <at> virtenio.de
  * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
  * Copyright (C) 2012 Kicad Developers, see change_log.txt for contributors.
- * Copyright (C) 2013 Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ * Copyright (C) 2013 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/include/view/view_rtree.h b/include/view/view_rtree.h
index 4762dfc691..168cf280dc 100644
--- a/include/view/view_rtree.h
+++ b/include/view/view_rtree.h
@@ -2,6 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2013 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License