diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc
index d60ee93952..e4dda21de0 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -69,7 +69,7 @@ RECIPE_MAINTAINER_pn-btrfs-tools = "Bogdan Marinescu <bogdan.a.marinescu@intel.c
 RECIPE_MAINTAINER_pn-busybox = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-byacc = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-bzip2 = "Radu Moisan <radu.moisan@intel.com>"
-RECIPE_MAINTAINER_pn-cairo = "Radu Moisan <radu.moisan@intel.com>"
+RECIPE_MAINTAINER_pn-cairo = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-calibrateproto = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-ccache = "Wenzong Fan <wenzong.fan@windriver.com>"
 RECIPE_MAINTAINER_pn-cdrtools = "Scott Garman <scott.a.garman@intel.com>"
@@ -120,7 +120,7 @@ RECIPE_MAINTAINER_pn-dates = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-db = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-dbus = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-dbus-glib = "Scott Garman <scott.a.garman@intel.com>"
-RECIPE_MAINTAINER_pn-dbus-wait = "Valentin Popa <valentin.popa@intel.com>"
+RECIPE_MAINTAINER_pn-dbus-wait = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-dhcp = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-diffstat = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-diffutils = "Radu Moisan <radu.moisan@intel.com>"
@@ -139,7 +139,7 @@ RECIPE_MAINTAINER_pn-e2fsprogs = "Scott Garman <scott.a.garman@intel.com>"
 RECIPE_MAINTAINER_pn-ed = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-eds-tools = "Wenzong Fan <wenzong.fan@windriver.com>"
 RECIPE_MAINTAINER_pn-eee-acpi-scripts = "Radu Moisan <radu.moisan@intel.com>"
-RECIPE_MAINTAINER_pn-eggdbus = "Radu Moisan <radu.moisan@intel.com>"
+RECIPE_MAINTAINER_pn-eggdbus = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-eglibc = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-elfutils = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-empathy = "Cristian Iorga <cristian.iorga@intel.com>"
@@ -173,7 +173,7 @@ RECIPE_MAINTAINER_pn-gamin = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-gawk = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-gcc = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-gccmakedep = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
-RECIPE_MAINTAINER_pn-gconf-dbus = "Radu Moisan <radu.moisan@intel.com>"
+RECIPE_MAINTAINER_pn-gconf-dbus = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-gdb = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-gdbm = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-gdk-pixbuf = "Valentin Popa <valentin.popa@intel.com>"
@@ -184,7 +184,7 @@ RECIPE_MAINTAINER_pn-ghostscript = "Kai Kang <kai.kang@windriver.com>"
 RECIPE_MAINTAINER_pn-git = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-glew = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-glib-2.0 = "Cristian Iorga <cristian.iorga@intel.com>"
-RECIPE_MAINTAINER_pn-glibc = "Cristian Iorga <cristian.iorga@intel.com>"
+RECIPE_MAINTAINER_pn-glibc = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-glproto = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-gmp = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-gnome-common = "Valentin Popa <valentin.popa@intel.com>"
@@ -256,7 +256,7 @@ RECIPE_MAINTAINER_pn-kbproto = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
 RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield <bruce.ashfield@windriver.com>"
 RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield <bruce.ashfield@windriver.com>"
 RECIPE_MAINTAINER_pn-kernelshark = "Darren Hart <dvhart@linux.intel.com>"
-RECIPE_MAINTAINER_pn-kexec-tools = "Cristian Iorga <cristian.iorga@intel.com>"
+RECIPE_MAINTAINER_pn-kexec-tools = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-keymaps = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-kf = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-kmod = "Radu Moisan <radu.moisan@intel.com>"
@@ -374,7 +374,6 @@ RECIPE_MAINTAINER_pn-libxext = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-libxfixes = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-libxfont = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-libxfontcache = "Valentin Popa <valentin.popa@intel.com>"
-RECIPE_MAINTAINER_pn-libxfontcache ="Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-libxft = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-libxi = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-libxinerama = "Valentin Popa <valentin.popa@intel.com>"
@@ -431,7 +430,7 @@ RECIPE_MAINTAINER_pn-m4 = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-mailx = "Kai Kang <kai.kang@windriver.com>"
 RECIPE_MAINTAINER_pn-make = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-makedepend = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
-RECIPE_MAINTAINER_pn-makedevs = "Cristian Iorga <cristian.iorga@intel.com>"
+RECIPE_MAINTAINER_pn-makedevs = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-matchbox-config-gtk = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-matchbox-desktop = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-matchbox-desktop-sato = "Valentin Popa <valentin.popa@intel.com>"
@@ -450,9 +449,9 @@ RECIPE_MAINTAINER_pn-matchbox-wm-2 = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-mc = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-mdadm = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
 RECIPE_MAINTAINER_pn-menu-cache = "Valentin Popa <valentin.popa@intel.com>"
-RECIPE_MAINTAINER_pn-mesa-dri = "Radu Moisan <radu.moisan@intel.com>"
-RECIPE_MAINTAINER_pn-mesa-dri-glsl-native = "Radu Moisan <radu.moisan@intel.com>"
-RECIPE_MAINTAINER_pn-mesa-xlib = "Radu Moisan <radu.moisan@intel.com>"
+RECIPE_MAINTAINER_pn-mesa-dri = "Valentin Popa <valentin.popa@intel.com>"
+RECIPE_MAINTAINER_pn-mesa-dri-glsl-native = "Valentin Popa <valentin.popa@intel.com>"
+RECIPE_MAINTAINER_pn-mesa-xlib = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-meta-ide-support = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-metacity = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-mingetty = "Xiaofeng.Yan <xiaofeng@windriver.com>"
@@ -468,7 +467,7 @@ RECIPE_MAINTAINER_pn-modutils-initscripts = "Radu Moisan <radu.moisan@intel.com>
 RECIPE_MAINTAINER_pn-modutils-initscripts = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-mpfr = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-msynctool = "Cristian Iorga <cristian.iorga@intel.com>"
-RECIPE_MAINTAINER_pn-mtd-utils = "Cristian Iorga <cristian.iorga@intel.com>"
+RECIPE_MAINTAINER_pn-mtd-utils = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-mtools = "Scott Garman <scott.a.garman@intel.com>"
 RECIPE_MAINTAINER_pn-mutter = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-mx = "Saul Wold <sgw@linux.intel.com>"
@@ -536,11 +535,11 @@ RECIPE_MAINTAINER_pn-python-dbus = "Bogdan Marinescu <bogdan.a.marinescu@intel.c
 RECIPE_MAINTAINER_pn-python-gst = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-python-imaging = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-python-imaging = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
-RECIPE_MAINTAINER_pn-python-pycairo = "Radu Moisan <radu.moisan@intel.com>"
+RECIPE_MAINTAINER_pn-python-pycairo = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-python-pycairo ="Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-python-pycurl = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-python-pygobject = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
-RECIPE_MAINTAINER_pn-python-pygtk = "Valentin Popa <valentin.popa@intel.com>"
+RECIPE_MAINTAINER_pn-python-pygtk = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-python-pyrex = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-python-scons = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-qemu = "Valentin Popa <valentin.popa@intel.com>"
@@ -578,7 +577,7 @@ RECIPE_MAINTAINER_pn-screenshot = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-scrnsaverproto = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
 RECIPE_MAINTAINER_pn-sed = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-build-appliance-image = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_MAINTAINER_pn-setserial = "Valentin Popa <valentin.popa@intel.com>"
+RECIPE_MAINTAINER_pn-setserial = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-settings-daemon = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-sgml-common = "Scott Garman <scott.a.garman@intel.com>"
 RECIPE_MAINTAINER_pn-sgmlspl = "Scott Garman <scott.a.garman@intel.com>"
@@ -593,7 +592,7 @@ RECIPE_MAINTAINER_pn-squashfs-tools = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-squashfs-tools = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-startup-notification = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-stat = "Radu Moisan <radu.moisan@intel.com>"
-RECIPE_MAINTAINER_pn-strace = "Cristian Iorga <cristian.iorga@intel.com>"
+RECIPE_MAINTAINER_pn-strace = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-subversion = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-sudo = "Scott Garman <scott.a.garman@intel.com>"
 RECIPE_MAINTAINER_pn-sysfsutils = "Saul Wold <sgw@linux.intel.com>"
@@ -682,9 +681,9 @@ RECIPE_MAINTAINER_pn-xauth = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
 RECIPE_MAINTAINER_pn-xbacklight = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
 RECIPE_MAINTAINER_pn-xcb-proto = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
 RECIPE_MAINTAINER_pn-xcb-util = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
-RECIPE_MAINTAINER_pn-xcb-util-image = "Valentin Popa <valentin.popa@intel.com>"
-RECIPE_MAINTAINER_pn-xcb-util-keysyms = "Valentin Popa <valentin.popa@intel.com>"
-RECIPE_MAINTAINER_pn-xcb-util-wm = "Valentin Popa <valentin.popa@intel.com>"
+RECIPE_MAINTAINER_pn-xcb-util-image = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
+RECIPE_MAINTAINER_pn-xcb-util-keysyms = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
+RECIPE_MAINTAINER_pn-xcb-util-wm = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
 RECIPE_MAINTAINER_pn-xcmiscproto = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
 RECIPE_MAINTAINER_pn-xcursor-transparent-theme = "Laurentiu Palcu <laurentiu.palcu@intel.com>"
 RECIPE_MAINTAINER_pn-xdg-utils = "Valentin Popa <valentin.popa@intel.com>"