diff --git a/configuration.c b/configuration.c
index 54ff6fc7b8..281ad1ad01 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1,6 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *  Copyright (C) 2016 - Brad Parker
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/configuration.h b/configuration.h
index 01202f37e0..9cf3d78e8f 100644
--- a/configuration.h
+++ b/configuration.h
@@ -1,6 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *  Copyright (C) 2016 - Brad Parker
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/intl/msg_hash_fr.c b/intl/msg_hash_fr.c
index b88e444be5..25e89106ad 100644
--- a/intl/msg_hash_fr.c
+++ b/intl/msg_hash_fr.c
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *
  *  RetroArch 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 Found-
diff --git a/lakka.h b/lakka.h
index 54c3e7513c..f1659d2ef8 100644
--- a/lakka.h
+++ b/lakka.h
@@ -1,6 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  * 
  *  RetroArch 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 Found-
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 83d2b270e0..bb76758d72 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2016 - Daniel De Matteis
- *  Copyright (C) 2014-2015 - Jean-André Santoni
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *  Copyright (C) 2016 - Brad Parker
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 04989d4a44..4677896684 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2016 - Daniel De Matteis
- *  Copyright (C) 2014-2015 - Jean-André Santoni
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *  Copyright (C) 2016 - Brad Parker
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/menu/menu_animation.c b/menu/menu_animation.c
index 1f2bfe3e87..175ac1998f 100644
--- a/menu/menu_animation.c
+++ b/menu/menu_animation.c
@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2014-2015 - Jean-André Santoni
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *  Copyright (C) 2011-2016 - Daniel De Matteis
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/menu/menu_animation.h b/menu/menu_animation.h
index 792bf4d60a..71daa5219a 100644
--- a/menu/menu_animation.h
+++ b/menu/menu_animation.h
@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2014-2015 - Jean-André Santoni
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *  Copyright (C) 2011-2016 - Daniel De Matteis
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/menu/menu_display.c b/menu/menu_display.c
index 7aeb3bcf28..7a05239a5b 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *  Copyright (C) 2016 - Brad Parker
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/menu/menu_display.h b/menu/menu_display.h
index 24aa476e76..5801964d4d 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *  Copyright (C) 2016 - Brad Parker
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index f7c2a0f184..cb262ed5c4 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *  Copyright (C) 2016 - Brad Parker
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/menu/menu_event.c b/menu/menu_event.c
index e467e8dd9a..2f1dca3b4e 100644
--- a/menu/menu_event.c
+++ b/menu/menu_event.c
@@ -1,6 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *
  *  RetroArch 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 Found-
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 7328942e54..1b65373d0c 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -1,6 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *  Copyright (C) 2016 - Brad Parker
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 3e418788ce..1504ee3f4e 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  *  Copyright (C) 2016 - Brad Parker
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/wifi/drivers/connmanctl.c b/wifi/drivers/connmanctl.c
index 3396aecdfe..d8e68dd678 100644
--- a/wifi/drivers/connmanctl.c
+++ b/wifi/drivers/connmanctl.c
@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2015 - Michael Lelli
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  * 
  *  RetroArch 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 Found-
diff --git a/wifi/drivers/nullwifi.c b/wifi/drivers/nullwifi.c
index 36a2eb6279..a2e960f8b5 100644
--- a/wifi/drivers/nullwifi.c
+++ b/wifi/drivers/nullwifi.c
@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2015 - Michael Lelli
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  * 
  *  RetroArch 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 Found-
diff --git a/wifi/wifi_driver.c b/wifi/wifi_driver.c
index b9f9bc4ff7..5c0d9c9f8f 100644
--- a/wifi/wifi_driver.c
+++ b/wifi/wifi_driver.c
@@ -1,6 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  * 
  *  RetroArch 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 Found-
diff --git a/wifi/wifi_driver.h b/wifi/wifi_driver.h
index 2ec13f0829..55646255e4 100644
--- a/wifi/wifi_driver.h
+++ b/wifi/wifi_driver.h
@@ -1,6 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
  * 
  *  RetroArch 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 Found-