Clean up and correct MAINTAINERS

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@739 311d38ba-8fff-0310-9ca6-ca027cbcb966

145 files changed, 3 insertions, 148 deletions

diff --git a/meta/classes/e.bbclass b/meta/classes/e.bbclass
index afd9b6d2b3..008e3f2dc1 100644
--- a/meta/classes/e.bbclass
+++ b/meta/classes/e.bbclass
@@ -1,4 +1,3 @@
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 HOMEPAGE = "http://www.enlightenment.org"
 SECTION = "e/apps"
 
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a4a3c754b9..228c8706e4 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -91,7 +91,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DESCRIPTION = "Version ${PV}-${PR} of package ${PN}"
 LICENSE = "unknown"
-MAINTAINER = "OpenEmbedded Team <oe@handhelds.org>"
+MAINTAINER = "OpenedHand <poky@openedhand.com>"
 HOMEPAGE = "unknown"
 
 # Package dependencies and provides.
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index ee3ec0680f..00261aa9ab 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -7,7 +7,7 @@ DISTRO_VERSION = "0.0-snapshot-${DATE}"
 
 DISTRO_TYPE ?= "release"
 
-MAINTAINER_poky = "OpenedHand <poky@openedhand.com>"
+MAINTAINER = "OpenedHand <poky@openedhand.com>"
 
 INHERIT += " package_ipk debian multimachine poky devshell "
 # For some reason, this doesn't work
diff --git a/meta/packages/alsa/alsa-lib_1.0.10.bb b/meta/packages/alsa/alsa-lib_1.0.10.bb
index a5d5426316..62694966bf 100644
--- a/meta/packages/alsa/alsa-lib_1.0.10.bb
+++ b/meta/packages/alsa/alsa-lib_1.0.10.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Alsa sound library"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 
diff --git a/meta/packages/alsa/alsa-oss_1.0.10.bb b/meta/packages/alsa/alsa-oss_1.0.10.bb
index acf2ba7505..b11947e86a 100644
--- a/meta/packages/alsa/alsa-oss_1.0.10.bb
+++ b/meta/packages/alsa/alsa-oss_1.0.10.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Alsa OSS Compatibility Package"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib"
diff --git a/meta/packages/alsa/alsa-utils_1.0.10.bb b/meta/packages/alsa/alsa-utils_1.0.10.bb
index 94e49ebf25..12d6ec962a 100644
--- a/meta/packages/alsa/alsa-utils_1.0.10.bb
+++ b/meta/packages/alsa/alsa-utils_1.0.10.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "ALSA Utilities"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
diff --git a/meta/packages/apt/apt.inc b/meta/packages/apt/apt.inc
index 9a4f8f329d..b18ed93782 100644
--- a/meta/packages/apt/apt.inc
+++ b/meta/packages/apt/apt.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Advanced front-end for dpkg."
 LICENSE = "GPL"
 SECTION = "base"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz"
 S = "${WORKDIR}/apt-${PV}"
diff --git a/meta/packages/avahi/avahi_0.6.13.bb b/meta/packages/avahi/avahi_0.6.13.bb
index 0898bf036c..a758997b4c 100644
--- a/meta/packages/avahi/avahi_0.6.13.bb
+++ b/meta/packages/avahi/avahi_0.6.13.bb
@@ -3,7 +3,6 @@ SECTION = "network"
 PRIORITY = "optional"
 AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://avahi.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE= "GPL"
 PR = "r1"
 
diff --git a/meta/packages/base-files/base-files_3.0.14.bb b/meta/packages/base-files/base-files_3.0.14.bb
index 866c016965..b8789321d9 100644
--- a/meta/packages/base-files/base-files_3.0.14.bb
+++ b/meta/packages/base-files/base-files_3.0.14.bb
@@ -142,7 +142,6 @@ PACKAGE_ARCH_rt3000 = "rt3000"
 
 PACKAGES_unslung = "${PN}-unslung"
 PACKAGE_ARCH_${PN}-unslung = "nslu2"
-MAINTAINER_${PN}-unslung = "NSLU2 Linux <www.nslu2-linux.org>"
 RDEPENDS_${PN}-unslung = "nslu2-linksys-ramdisk"
 RPROVIDES_${PN}-unslung = "${PN}"
 
diff --git a/meta/packages/binutils/binutils_2.15.94.0.1.bb b/meta/packages/binutils/binutils_2.15.94.0.1.bb
index 43ac3db2ae..9aa1b050d3 100644
--- a/meta/packages/binutils/binutils_2.15.94.0.1.bb
+++ b/meta/packages/binutils/binutils_2.15.94.0.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 PR = "r3"
 
 inherit autotools gettext
diff --git a/meta/packages/binutils/binutils_2.16.bb b/meta/packages/binutils/binutils_2.16.bb
index dbb4b94d2e..c56f227d58 100644
--- a/meta/packages/binutils/binutils_2.16.bb
+++ b/meta/packages/binutils/binutils_2.16.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 PR = "r7"
 
 SRC_URI = \
diff --git a/meta/packages/cairo/cairo_1.0.0.bb b/meta/packages/cairo/cairo_1.0.0.bb
index 10603e3f2f..144196a7e5 100644
--- a/meta/packages/cairo/cairo_1.0.0.bb
+++ b/meta/packages/cairo/cairo_1.0.0.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libx11 libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
diff --git a/meta/packages/cairo/cairo_1.2.4.bb b/meta/packages/cairo/cairo_1.2.4.bb
index bad6da8bde..91528f6da0 100644
--- a/meta/packages/cairo/cairo_1.2.4.bb
+++ b/meta/packages/cairo/cairo_1.2.4.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libx11 libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
diff --git a/meta/packages/compositeext/compositeext_cvs.bb b/meta/packages/compositeext/compositeext_cvs.bb
index 94160746e6..8f0f4f9f46 100644
--- a/meta/packages/compositeext/compositeext_cvs.bb
+++ b/meta/packages/compositeext/compositeext_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xextensions fixesext"
 DESCRIPTION = "X Composite extension headers and specification"
 DEFAULT_PREFERENCE = "1"
diff --git a/meta/packages/damageext/damageext_cvs.bb b/meta/packages/damageext/damageext_cvs.bb
index 86a6032b29..e9ffa7d2b1 100644
--- a/meta/packages/damageext/damageext_cvs.bb
+++ b/meta/packages/damageext/damageext_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT-X"
 SECTION = "libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xextensions fixesext"
 DESCRIPTION = "X Damage extension headers and specification"
 PR = "r1"
diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc
index 0d2053ab0f..0e057c981e 100644
--- a/meta/packages/dpkg/dpkg.inc
+++ b/meta/packages/dpkg/dpkg.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Package maintenance system for Debian."
 LICENSE = "GPL"
 SECTION = "base"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
            file://noupdalt.patch;patch=1"
diff --git a/meta/packages/fixesext/fixesext_cvs.bb b/meta/packages/fixesext/fixesext_cvs.bb
index 30b9460138..4ddbc96c64 100644
--- a/meta/packages/fixesext/fixesext_cvs.bb
+++ b/meta/packages/fixesext/fixesext_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xextensions"
 DESCRIPTION = "X Fixes extension headers and specification."
 DEFAULT_PREFERENCE = "1"
diff --git a/meta/packages/flac/flac_1.1.2.bb b/meta/packages/flac/flac_1.1.2.bb
index ec9d1b7197..cbfaaa0ff5 100644
--- a/meta/packages/flac/flac_1.1.2.bb
+++ b/meta/packages/flac/flac_1.1.2.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "FLAC is a Free Lossless Audio Codec."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "BSD GPL"
 SECTION = "libs"
 DEPENDS = "libogg"
diff --git a/meta/packages/fstests/fstests.bb b/meta/packages/fstests/fstests.bb
index ba27c82810..84159d3520 100644
--- a/meta/packages/fstests/fstests.bb
+++ b/meta/packages/fstests/fstests.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "various benchmarning tests for X"
 HOMEPAGE = "http://www.o-hand.com"
 SECTION = "devel"
 LICENSE = "GPL"
-MAINTAINER = "Matthew Allum <mallum@o-hand.com>"
 PR = "r0"
 
 inherit autotools
diff --git a/meta/packages/galago/galago-daemon_0.3.4.bb b/meta/packages/galago/galago-daemon_0.3.4.bb
index 22257b6f44..9e27f72605 100644
--- a/meta/packages/galago/galago-daemon_0.3.4.bb
+++ b/meta/packages/galago/galago-daemon_0.3.4.bb
@@ -1,6 +1,5 @@
 DESCRIPTION =   "Galago is a desktop presence framework, designed to transmit presence information between programs."
 HOMEPAGE =      "http://www.galago-project.org/"
-MAINTAINER =    "Koen Kooi <koen@handhelds.org>"
 LICENSE =       "GPL"
 DEPENDS =       "gettext libgalago dbus glib-2.0"
 PR = "r1"
diff --git a/meta/packages/galago/libgalago_0.3.3.bb b/meta/packages/galago/libgalago_0.3.3.bb
index 85f4097806..64064728b8 100644
--- a/meta/packages/galago/libgalago_0.3.3.bb
+++ b/meta/packages/galago/libgalago_0.3.3.bb
@@ -1,6 +1,5 @@
 DESCRIPTION =   "Galago is a desktop presence framework, designed to transmit presence information between programs."
 HOMEPAGE =      "http://www.galago-project.org/"
-MAINTAINER =    "Koen Kooi <koen@handhelds.org>"
 LICENSE =       "LGPL"
 DEPENDS =       "gettext dbus glib-2.0"
 PR =            "r1"
diff --git a/meta/packages/gcalctool/gcalctool_5.7.32.bb b/meta/packages/gcalctool/gcalctool_5.7.32.bb
index cb416235a3..bad339482f 100644
--- a/meta/packages/gcalctool/gcalctool_5.7.32.bb
+++ b/meta/packages/gcalctool/gcalctool_5.7.32.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "gtk+"
-MAINTAINER = "Ross Burton <ross@openedhand.com>"
 DESCRIPTION = "gcalctool is a powerful calculator
 PR = "r1"
 
diff --git a/meta/packages/gcc/gcc_3.3.4.bb b/meta/packages/gcc/gcc_3.3.4.bb
index dc3a66cd29..1fca01f2f4 100644
--- a/meta/packages/gcc/gcc_3.3.4.bb
+++ b/meta/packages/gcc/gcc_3.3.4.bb
@@ -5,7 +5,6 @@ inherit autotools gettext
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 # libgcc libstdc++ libg2c are listed in our FILES_*, but are actually
 # packaged in the respective cross packages.
diff --git a/meta/packages/gcc/gcc_3.4.3.bb b/meta/packages/gcc/gcc_3.4.3.bb
index f1a1545274..289fe8fdd6 100644
--- a/meta/packages/gcc/gcc_3.4.3.bb
+++ b/meta/packages/gcc/gcc_3.4.3.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 inherit autotools gettext
 
diff --git a/meta/packages/gcc/gcc_3.4.4.bb b/meta/packages/gcc/gcc_3.4.4.bb
index 66bc4381d0..74ce0fedcc 100644
--- a/meta/packages/gcc/gcc_3.4.4.bb
+++ b/meta/packages/gcc/gcc_3.4.4.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 inherit autotools gettext
 
diff --git a/meta/packages/gcc/gcc_4.0.2.bb b/meta/packages/gcc/gcc_4.0.2.bb
index 29f0b0f63e..299b6bbd8c 100644
--- a/meta/packages/gcc/gcc_4.0.2.bb
+++ b/meta/packages/gcc/gcc_4.0.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 DEPENDS = "mpfr gmp"
 PR = "r1"
 
diff --git a/meta/packages/gdb/gdb-cross_6.3.bb b/meta/packages/gdb/gdb-cross_6.3.bb
index a6823b6373..32076b529e 100644
--- a/meta/packages/gdb/gdb-cross_6.3.bb
+++ b/meta/packages/gdb/gdb-cross_6.3.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "gdb - GNU debugger"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
 DEPENDS = "ncurses-native"
 
 inherit autotools sdk
diff --git a/meta/packages/gdb/gdb_6.3.bb b/meta/packages/gdb/gdb_6.3.bb
index 3e755cee67..bce00f42f1 100644
--- a/meta/packages/gdb/gdb_6.3.bb
+++ b/meta/packages/gdb/gdb_6.3.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gnu.org/software/gdb/"
 LICENSE="GPL"
 SECTION = "devel"
 PRIORITY = "optional"
-MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "ncurses readline"
 RDEPENDS_openmn = "libthread-db1"
 PR = "r2"
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/meta/packages/glib-2.0/glib-2.0-native_2.6.5.bb
index 785261e7cf..2c7627221a 100644
--- a/meta/packages/glib-2.0/glib-2.0-native_2.6.5.bb
+++ b/meta/packages/glib-2.0/glib-2.0-native_2.6.5.bb
@@ -6,7 +6,6 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk-doc-native"
 PR = "r3"
 
diff --git a/meta/packages/glib-2.0/glib-2.0_2.6.4.bb b/meta/packages/glib-2.0/glib-2.0_2.6.4.bb
index 2765cc0a63..f1cb21740a 100644
--- a/meta/packages/glib-2.0/glib-2.0_2.6.4.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.6.4.bb
@@ -6,7 +6,6 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
diff --git a/meta/packages/glib-2.0/glib-2.0_2.8.6.bb b/meta/packages/glib-2.0/glib-2.0_2.8.6.bb
index e0f171ea4a..3c106246c0 100644
--- a/meta/packages/glib-2.0/glib-2.0_2.8.6.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.8.6.bb
@@ -6,7 +6,6 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
diff --git a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 12f56262f1..8e5adb7ed9 100644
--- a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
diff --git a/meta/packages/gnome/gconf-dbus_cvs.bb b/meta/packages/gnome/gconf-dbus_cvs.bb
index f8be0c4eee..865379b71c 100755
--- a/meta/packages/gnome/gconf-dbus_cvs.bb
+++ b/meta/packages/gnome/gconf-dbus_cvs.bb
@@ -2,7 +2,6 @@ SECTION = "x11/utils"
 DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
 DESCRIPTION = "Settings daemon using DBUS for communication."
 LICENSE = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
diff --git a/meta/packages/gnome/gconf-dbus_svn.bb b/meta/packages/gnome/gconf-dbus_svn.bb
index 1aba51c56c..b74043d470 100644
--- a/meta/packages/gnome/gconf-dbus_svn.bb
+++ b/meta/packages/gnome/gconf-dbus_svn.bb
@@ -2,7 +2,6 @@ SECTION = "x11/utils"
 DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
 DESCRIPTION = "Settings daemon using DBUS for communication."
 LICENSE = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
diff --git a/meta/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/meta/packages/gtk+/gtk+_2.6.4-1.osso7.bb
index e2065b3faa..6a6d560a50 100644
--- a/meta/packages/gtk+/gtk+_2.6.4-1.osso7.bb
+++ b/meta/packages/gtk+/gtk+_2.6.4-1.osso7.bb
@@ -4,7 +4,6 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project
 HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
 PR = "r1"
 
diff --git a/meta/packages/gtk+/gtk+_2.8.16.bb b/meta/packages/gtk+/gtk+_2.8.16.bb
index c2ffaad742..3aa2f5b4e4 100644
--- a/meta/packages/gtk+/gtk+_2.8.16.bb
+++ b/meta/packages/gtk+/gtk+_2.8.16.bb
@@ -4,7 +4,6 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project
 HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
 PR = "r2"
 
diff --git a/meta/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb b/meta/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
index 34e1212694..b3bf0b6c59 100644
--- a/meta/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
+++ b/meta/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/base"
 DESCRIPTION = "Clearlooks theme engine for GTK"
-MAINTAINER = "Koen Kooi <koenhandhelds.org>"
 LICENSE = "GPL2"
 DEPENDS = "gtk+"
 
diff --git a/meta/packages/hal/hal_0.5.4.bb b/meta/packages/hal/hal_0.5.4.bb
index 3d439b79d9..147439d4c3 100644
--- a/meta/packages/hal/hal_0.5.4.bb
+++ b/meta/packages/hal/hal_0.5.4.bb
@@ -1,6 +1,5 @@
 SECTION = "unknown"
 DESCRIPTION = "Hardware Abstraction Layer"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "dbus expat libusb"
 RDEPENDS += "hotplug"
 RDEPENDS_hal-device-manager = "python hal python-pygnome"
diff --git a/meta/packages/hostap/hostap-conf_1.0.bb b/meta/packages/hostap/hostap-conf_1.0.bb
index 094722c845..1b0edf19cb 100644
--- a/meta/packages/hostap/hostap-conf_1.0.bb
+++ b/meta/packages/hostap/hostap-conf_1.0.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/meta/packages/hostap/hostap-modules.inc b/meta/packages/hostap/hostap-modules.inc
index 5ce5e0db67..a3bf503f9f 100644
--- a/meta/packages/hostap/hostap-modules.inc
+++ b/meta/packages/hostap/hostap-modules.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz"
diff --git a/meta/packages/hostap/hostap-utils.inc b/meta/packages/hostap/hostap-utils.inc
index 1e4362d0f7..c039aba9dc 100644
--- a/meta/packages/hostap/hostap-utils.inc
+++ b/meta/packages/hostap/hostap-utils.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "User mode helpers for the hostap driver"
 HOMEPAGE = "http://hostap.epitest.fi"
 SECTION = "kernel/userland"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RRECOMMENDS = "hostap-modules"
 PR = "r3"
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index eebfbca7bf..222c1eee7c 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "SysV init scripts"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "makedevs"
diff --git a/meta/packages/intltool/intltool_0.31.bb b/meta/packages/intltool/intltool_0.31.bb
index 1fdc1bef20..f1660e7262 100644
--- a/meta/packages/intltool/intltool_0.31.bb
+++ b/meta/packages/intltool/intltool_0.31.bb
@@ -1,6 +1,5 @@
 SECTION = "devel"
 DESCRIPTION = "Utility scripts for internationalizing XML"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 
 SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2"
diff --git a/meta/packages/jpeg/jpeg_6b.bb b/meta/packages/jpeg/jpeg_6b.bb
index 23e3ed82be..0960a7aa80 100644
--- a/meta/packages/jpeg/jpeg_6b.bb
+++ b/meta/packages/jpeg/jpeg_6b.bb
@@ -1,7 +1,6 @@
 PR = "r2"
 SECTION = "libs"
 PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "libtool-cross"
 DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format."
 PACKAGES =+ "jpeg-tools "
diff --git a/meta/packages/keymaps/keymaps_1.0.bb b/meta/packages/keymaps/keymaps_1.0.bb
index a906d7f383..46b88e966f 100644
--- a/meta/packages/keymaps/keymaps_1.0.bb
+++ b/meta/packages/keymaps/keymaps_1.0.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Keyboard map"
 SECTION = "base"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
diff --git a/meta/packages/libdaemon/libdaemon_0.10.bb b/meta/packages/libdaemon/libdaemon_0.10.bb
index 6f4c5eac54..a166414e61 100644
--- a/meta/packages/libdaemon/libdaemon_0.10.bb
+++ b/meta/packages/libdaemon/libdaemon_0.10.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of U
 SECTION = "libs"
 AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE = "LGPL"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
diff --git a/meta/packages/libglade/libglade_2.5.1.bb b/meta/packages/libglade/libglade_2.5.1.bb
index 7738b10f93..4dcbe69828 100644
--- a/meta/packages/libglade/libglade_2.5.1.bb
+++ b/meta/packages/libglade/libglade_2.5.1.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Runtime support for GTK interface builder"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "gtk+ gtk-doc"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 inherit autotools pkgconfig gnome
 
diff --git a/meta/packages/libiconv/libiconv_1.9.2.bb b/meta/packages/libiconv/libiconv_1.9.2.bb
index 16a595ca6c..4f8f694e07 100644
--- a/meta/packages/libiconv/libiconv_1.9.2.bb
+++ b/meta/packages/libiconv/libiconv_1.9.2.bb
@@ -3,7 +3,6 @@ multiple character encodings, but that support lacks from your system."
 HOMEPAGE = "http://www.gnu.org/software/libiconv"
 SECTION = "e/libs"
 PRIORITY = "optional"
-MAINTAINER = "That Crazy fool emte <emte@labotomy.net>"
 NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
 PROVIDES = "virtual/libiconv"
 PR = "r3"
diff --git a/meta/packages/libid3tag/libid3tag_0.15.0b.bb b/meta/packages/libid3tag/libid3tag_0.15.0b.bb
index e47c00e76f..840c7f8ae7 100644
--- a/meta/packages/libid3tag/libid3tag_0.15.0b.bb
+++ b/meta/packages/libid3tag/libid3tag_0.15.0b.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "zlib"
 DESCRIPTION = "Library for interacting with ID3 tags."
 LICENSE = "GPL"
diff --git a/meta/packages/libmad/libmad_0.15.0b.bb b/meta/packages/libmad/libmad_0.15.0b.bb
index b3614db05a..d6e6dda1d6 100644
--- a/meta/packages/libmad/libmad_0.15.0b.bb
+++ b/meta/packages/libmad/libmad_0.15.0b.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "MPEG Audio Decoder Library"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "libid3tag"
 LICENSE = "GPL"
 PR = "r2"
diff --git a/meta/packages/liboil/liboil_0.3.9.bb b/meta/packages/liboil/liboil_0.3.9.bb
index 65d2b149fc..b9e5c29748 100644
--- a/meta/packages/liboil/liboil_0.3.9.bb
+++ b/meta/packages/liboil/liboil_0.3.9.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
 HOMEPAGE = "http://liboil.freedesktop.org/"
 LICENSE = "various"
-MAINTAINER = "Koen Kooi <koen@on.kabel.utwente.nl>"
 PR = "r1"
 
 SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
diff --git a/meta/packages/libpng/libpng_1.2.8.bb b/meta/packages/libpng/libpng_1.2.8.bb
index 81274dc762..52d8818f8a 100644
--- a/meta/packages/libpng/libpng_1.2.8.bb
+++ b/meta/packages/libpng/libpng_1.2.8.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.libpng.org/"
 LICENSE = "libpng"
 SECTION = "libs"
 PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 DEPENDS = "zlib"
 
diff --git a/meta/packages/libxml/libxml2_2.6.10.bb b/meta/packages/libxml/libxml2_2.6.10.bb
index 9f789a499e..58de56b2f4 100644
--- a/meta/packages/libxml/libxml2_2.6.10.bb
+++ b/meta/packages/libxml/libxml2_2.6.10.bb
@@ -2,7 +2,6 @@ PR = "r0"
 DESCRIPTION = "GNOME XML library"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "MIT"
 PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 
diff --git a/meta/packages/libxml/libxml2_cvs.bb b/meta/packages/libxml/libxml2_cvs.bb
index 29fb53fc04..14a5ebba10 100644
--- a/meta/packages/libxml/libxml2_cvs.bb
+++ b/meta/packages/libxml/libxml2_cvs.bb
@@ -3,7 +3,6 @@ PR = "r0"
 DESCRIPTION = "GNOME XML library"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "MIT"
 PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
index 2f471223e6..c43664094d 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
@@ -7,7 +7,6 @@ HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"
 #   standard linux kernel license applies. 
 # since we assume GPL for linux i think we can also assume it here
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 INHIBIT_DEFAULT_DEPS = "1"
 PR = "r2"
 
diff --git a/meta/packages/linux/linux-openzaurus.inc b/meta/packages/linux/linux-openzaurus.inc
index 532b35b748..ba446bdda5 100644
--- a/meta/packages/linux/linux-openzaurus.inc
+++ b/meta/packages/linux/linux-openzaurus.inc
@@ -1,8 +1,5 @@
 DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750."
 SECTION = "kernel"
-MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, \
-              Michael 'Mickey' Lauer <mickey@vanille.de>, \
-              Marcin 'Hrw' Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 
 inherit kernel
diff --git a/meta/packages/lirc/lirc-modules_0.7.1.bb b/meta/packages/lirc/lirc-modules_0.7.1.bb
index 0bf709ee92..1605e2d5c5 100644
--- a/meta/packages/lirc/lirc-modules_0.7.1.bb
+++ b/meta/packages/lirc/lirc-modules_0.7.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel fakeroot-native"
 PR = "r2"
diff --git a/meta/packages/lirc/lirc_0.7.1.bb b/meta/packages/lirc/lirc_0.7.1.bb
index cd65dcedae..76925e3ac2 100644
--- a/meta/packages/lirc/lirc_0.7.1.bb
+++ b/meta/packages/lirc/lirc_0.7.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel libx11 libxau libsm libice"
 PR = "r5"
diff --git a/meta/packages/loudmouth/loudmouth_1.0.1.bb b/meta/packages/loudmouth/loudmouth_1.0.1.bb
index 9161cd630b..01de005115 100755
--- a/meta/packages/loudmouth/loudmouth_1.0.1.bb
+++ b/meta/packages/loudmouth/loudmouth_1.0.1.bb
@@ -1,6 +1,5 @@
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 gnutls"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
 DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol."
 PR = "r1"
 
diff --git a/meta/packages/lttng/lttng-control_0.10.bb b/meta/packages/lttng/lttng-control_0.10.bb
index 24399e4ec8..b635c32433 100644
--- a/meta/packages/lttng/lttng-control_0.10.bb
+++ b/meta/packages/lttng/lttng-control_0.10.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
 extract program execution details from the Linux operating system and  \
 interpret them."
 LICENSE = "GPL"
-MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>"
+MAINTAINER = "Richard Purdie <richard@openedhand.com>"
 
 SRC_URI = "http://ltt.polymtl.ca/lttng/ltt-control-${PV}-12062006.tar.gz \
            file://lttctl_sti-r0.patch;patch=1 "
diff --git a/meta/packages/m4/m4_1.4.2.bb b/meta/packages/m4/m4_1.4.2.bb
index 9228ef4334..05a9b5b0a5 100644
--- a/meta/packages/m4/m4_1.4.2.bb
+++ b/meta/packages/m4/m4_1.4.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
 processor."
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
            file://make.patch;patch=1"
 S = "${WORKDIR}/m4-${PV}"
diff --git a/meta/packages/maemo/nokia770-init_1.0.bb b/meta/packages/maemo/nokia770-init_1.0.bb
index 84c1e3c279..cab24a346f 100644
--- a/meta/packages/maemo/nokia770-init_1.0.bb
+++ b/meta/packages/maemo/nokia770-init_1.0.bb
@@ -1,5 +1,4 @@
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de"
 PR         = "r5"
 
 DEPENDS    = "base-passwd"
diff --git a/meta/packages/mozilla/minimo_cvs.bb b/meta/packages/mozilla/minimo_cvs.bb
index 273e4da56b..26cc4ed8df 100644
--- a/meta/packages/mozilla/minimo_cvs.bb
+++ b/meta/packages/mozilla/minimo_cvs.bb
@@ -6,7 +6,6 @@ SRC_URI = "cvs://anonymous@cvs-mirror.mozilla.org/cvsroot;module=mozilla \
            file://host_ldflags_fix.patch;patch=1 \
            file://minimo.png file://minimo.desktop"
 S = "${WORKDIR}/mozilla"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11"
 PRIORITY = "optional"
 PV = "0.0+cvs${SRCDATE}"
diff --git a/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb b/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
index 0d07d20656..4ac443574c 100644
--- a/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
+++ b/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Library and test program for decoding mpeg-2 and mpeg-1 video str
 HOMEPAGE = "http://libmpeg2.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 PR = "r1"
 
diff --git a/meta/packages/mpfr/mpfr_2.1.1.bb b/meta/packages/mpfr/mpfr_2.1.1.bb
index 1bf29fb6b1..59b9965aa4 100644
--- a/meta/packages/mpfr/mpfr_2.1.1.bb
+++ b/meta/packages/mpfr/mpfr_2.1.1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
 LICENSE = "LGPL"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 DEPENDS = "gmp"
 PR = "r2"
diff --git a/meta/packages/musicbrainz/libmusicbrainz_2.1.2.bb b/meta/packages/musicbrainz/libmusicbrainz_2.1.2.bb
index 14eac7adce..43632d8670 100644
--- a/meta/packages/musicbrainz/libmusicbrainz_2.1.2.bb
+++ b/meta/packages/musicbrainz/libmusicbrainz_2.1.2.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs.  The library allows you to access the data held on the MusicBrainz server."
 HOMEPAGE = "http://musicbrainz.org"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE = "LGPL"
 DEPENDS = "expat"
 
diff --git a/meta/packages/openswan/openswan_2.2.0.bb b/meta/packages/openswan/openswan_2.2.0.bb
index 197fed95f6..6ddb4584e0 100644
--- a/meta/packages/openswan/openswan_2.2.0.bb
+++ b/meta/packages/openswan/openswan_2.2.0.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \
 Linux operating system."
 HOMEPAGE = "http://www.openswan.org"
 LICENSE = "GPLv2"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 DEPENDS = "gmp flex-native"
 RRECOMMENDS = "kernel-module-ipsec"
 RDEPENDS_nylon = "perl"
diff --git a/meta/packages/oprofile/oprofile_0.9.1.bb b/meta/packages/oprofile/oprofile_0.9.1.bb
index 1cbb05d418..991c7bfc99 100644
--- a/meta/packages/oprofile/oprofile_0.9.1.bb
+++ b/meta/packages/oprofile/oprofile_0.9.1.bb
@@ -2,7 +2,6 @@ SECTION = "devel"
 DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
 of profiling all running code at low overhead."
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "popt binutils"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
diff --git a/meta/packages/oprofile/oprofile_cvs.bb b/meta/packages/oprofile/oprofile_cvs.bb
index 73ded09a16..1a255d3577 100644
--- a/meta/packages/oprofile/oprofile_cvs.bb
+++ b/meta/packages/oprofile/oprofile_cvs.bb
@@ -3,7 +3,6 @@ SECTION = "devel"
 DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
 of profiling all running code at low overhead."
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "popt binutils"
 
 SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
diff --git a/meta/packages/orinoco/orinoco-conf_1.0.bb b/meta/packages/orinoco/orinoco-conf_1.0.bb
index fbb748686e..6fb90970a7 100644
--- a/meta/packages/orinoco/orinoco-conf_1.0.bb
+++ b/meta/packages/orinoco/orinoco-conf_1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "PCMCIA-cs configuration files for Hermes (Orinoco) wireless LAN cards"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de> Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 PACKAGE_ARCH = "all"
 PR = "r2"
diff --git a/meta/packages/orinoco/orinoco-modules_0.15rc2.bb b/meta/packages/orinoco/orinoco-modules_0.15rc2.bb
index e75924c19d..b31f1bf6c2 100644
--- a/meta/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/meta/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -5,7 +5,6 @@ PRIORITY = "optional"
 PROVIDES = "spectrum-modules"
 DEPENDS = "orinoco-conf spectrum-fw"
 RDEPENDS = "orinoco-conf"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r9"
 
diff --git a/meta/packages/perl/perl-native_5.8.7.bb b/meta/packages/perl/perl-native_5.8.7.bb
index af7680f013..338d1617cc 100644
--- a/meta/packages/perl/perl-native_5.8.7.bb
+++ b/meta/packages/perl/perl-native_5.8.7.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Perl is a popular scripting language."
-MAINTAINER="David Karlstrom <daka@thg.se>"
 HOMEPAGE = "http://www.perl.org/"
 LICENSE = "Artistic|GPL"
 PR = "r3"
diff --git a/meta/packages/perl/perl_5.8.7.bb b/meta/packages/perl/perl_5.8.7.bb
index b3cfd1a3bb..5e1c4660d8 100644
--- a/meta/packages/perl/perl_5.8.7.bb
+++ b/meta/packages/perl/perl_5.8.7.bb
@@ -1,4 +1,3 @@
-MAINTAINER="David Karlstrom <daka@thg.se>"
 
 require perl.inc
 
diff --git a/meta/packages/ppp-dialin/ppp-dialin_0.1.bb b/meta/packages/ppp-dialin/ppp-dialin_0.1.bb
index 815ed14d3b..f0d410e455 100644
--- a/meta/packages/ppp-dialin/ppp-dialin_0.1.bb
+++ b/meta/packages/ppp-dialin/ppp-dialin_0.1.bb
@@ -1,6 +1,5 @@
 SECTION = "console/network"
 DESCRIPTION = "Enables PPP dial-in through a serial connection"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 DEPENDS = "ppp"
 RDEPENDS = "ppp"
 PR = "r4"
diff --git a/meta/packages/prism3-support/prism3-support_1.0.0.bb b/meta/packages/prism3-support/prism3-support_1.0.0.bb
index 85f1391ed4..830da22c2b 100644
--- a/meta/packages/prism3-support/prism3-support_1.0.0.bb
+++ b/meta/packages/prism3-support/prism3-support_1.0.0.bb
@@ -3,7 +3,6 @@ SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "prism3-firmware hostap-utils"
 RDEPENDS = "prism3-firmware hostap-utils"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PACKAGE_ARCH = "all"
 PR = "r2"
 
diff --git a/meta/packages/psmisc/psmisc_20.2.bb b/meta/packages/psmisc/psmisc_20.2.bb
index 0f742b8ef5..a6140e7414 100644
--- a/meta/packages/psmisc/psmisc_20.2.bb
+++ b/meta/packages/psmisc/psmisc_20.2.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "procfs tools"
 SECTION = "base"
 PRIORITY = "required"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "ncurses"
 PR = "r3"
 
diff --git a/meta/packages/quilt/quilt.inc b/meta/packages/quilt/quilt.inc
index 387ec8f057..b1d19daf45 100644
--- a/meta/packages/quilt/quilt.inc
+++ b/meta/packages/quilt/quilt.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Tool to work with series of patches."
 HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/"
 SECTION = "devel"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPL"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz "
diff --git a/meta/packages/randrext/randrext_1.0.bb b/meta/packages/randrext/randrext_1.0.bb
index 4a8607c691..3fe6a442ac 100644
--- a/meta/packages/randrext/randrext_1.0.bb
+++ b/meta/packages/randrext/randrext_1.0.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 LICENSE= "BSD-X"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "X Resize and Rotate extension headers"
 
 SRC_URI = "${XLIBS_MIRROR}/randrext-${PV}.tar.bz2"
diff --git a/meta/packages/randrext/randrext_cvs.bb b/meta/packages/randrext/randrext_cvs.bb
index a16139b539..29cff38373 100644
--- a/meta/packages/randrext/randrext_cvs.bb
+++ b/meta/packages/randrext/randrext_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "X Resize and Rotate extension headers"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Randr"
diff --git a/meta/packages/recordext/recordext_cvs.bb b/meta/packages/recordext/recordext_cvs.bb
index 494b53acdd..eeaae24762 100644
--- a/meta/packages/recordext/recordext_cvs.bb
+++ b/meta/packages/recordext/recordext_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "libs"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "XRecord extension protocol bits"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=RecordExt"
diff --git a/meta/packages/renderext/renderext_0.8.bb b/meta/packages/renderext/renderext_0.8.bb
index f1996a3fd3..a12f7c0da5 100644
--- a/meta/packages/renderext/renderext_0.8.bb
+++ b/meta/packages/renderext/renderext_0.8.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 LICENSE = "MIT-X"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "X Render extension headers"
 
 SRC_URI = "${XLIBS_MIRROR}/renderext-${PV}.tar.bz2"
diff --git a/meta/packages/renderext/renderext_cvs.bb b/meta/packages/renderext/renderext_cvs.bb
index af84c6f8ee..08053d95b9 100644
--- a/meta/packages/renderext/renderext_cvs.bb
+++ b/meta/packages/renderext/renderext_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT-X"
 SECTION = "libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "X Render extension headers"
 DEFAULT_PREFERENCE = "1"
 
diff --git a/meta/packages/resourceext/resourceext_1.0.bb b/meta/packages/resourceext/resourceext_1.0.bb
index 6ba9ae2cd4..55780b1d22 100644
--- a/meta/packages/resourceext/resourceext_1.0.bb
+++ b/meta/packages/resourceext/resourceext_1.0.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 LICENSE = "Xorg"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xextensions"
 DESCRIPTION = "X Resource usage extension headers"
 
diff --git a/meta/packages/resourceext/resourceext_cvs.bb b/meta/packages/resourceext/resourceext_cvs.bb
index 92ac8d75b0..b0fe23392e 100644
--- a/meta/packages/resourceext/resourceext_cvs.bb
+++ b/meta/packages/resourceext/resourceext_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 SECTION = "libs"
 LICENSE = "Xorg"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xextensions"
 DESCRIPTION = "X Resource usage extension headers"
 
diff --git a/meta/packages/startup-notification/startup-notification_0.8.bb b/meta/packages/startup-notification/startup-notification_0.8.bb
index 36181f4043..4b94901ec5 100644
--- a/meta/packages/startup-notification/startup-notification_0.8.bb
+++ b/meta/packages/startup-notification/startup-notification_0.8.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Startup notification support"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "libx11"
 PR = "r1"
 
diff --git a/meta/packages/sysvinit/sysvinit_2.86.bb b/meta/packages/sysvinit/sysvinit_2.86.bb
index e2124c7fe9..72ce082da6 100644
--- a/meta/packages/sysvinit/sysvinit_2.86.bb
+++ b/meta/packages/sysvinit/sysvinit_2.86.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "System-V like init."
 SECTION = "base"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
 PR = "r24"
 
diff --git a/meta/packages/tremor/tremor_20041119.bb b/meta/packages/tremor/tremor_20041119.bb
index 63de7a4239..276ac491e0 100644
--- a/meta/packages/tremor/tremor_20041119.bb
+++ b/meta/packages/tremor/tremor_20041119.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "libogg"
 DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec."
 LICENSE = "BSD"
diff --git a/meta/packages/update-alternatives/update-alternatives-cworth.inc b/meta/packages/update-alternatives/update-alternatives-cworth.inc
index e5bf1c8e27..d2d78c9a00 100644
--- a/meta/packages/update-alternatives/update-alternatives-cworth.inc
+++ b/meta/packages/update-alternatives/update-alternatives-cworth.inc
@@ -1,6 +1,5 @@
 LICENSE = "GPL"
 SECTION = "base"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')}"
 S = "${WORKDIR}/ipkg/C"
 PACKAGE_ARCH = "all"
diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg.inc b/meta/packages/update-alternatives/update-alternatives-dpkg.inc
index e767ed632b..cffcf836bf 100644
--- a/meta/packages/update-alternatives/update-alternatives-dpkg.inc
+++ b/meta/packages/update-alternatives/update-alternatives-dpkg.inc
@@ -1,6 +1,5 @@
 LICENSE = "GPL"
 SECTION = "base"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
 S = "${WORKDIR}/dpkg-${PV}"
 PACKAGE_ARCH = "all"
diff --git a/meta/packages/update-rc.d/update-rc.d_0.6.bb b/meta/packages/update-rc.d/update-rc.d_0.6.bb
index ba2f551371..38b4c218f5 100644
--- a/meta/packages/update-rc.d/update-rc.d_0.6.bb
+++ b/meta/packages/update-rc.d/update-rc.d_0.6.bb
@@ -1,7 +1,6 @@
 SECTION = "base"
 PRIORITY = "standard"
 DESCRIPTION = "Manage symlinks in /etc/rcN.d"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 S = "${WORKDIR}/update-rc.d"
 PR = "r1"
diff --git a/meta/packages/update-rc.d/update-rc.d_0.7.bb b/meta/packages/update-rc.d/update-rc.d_0.7.bb
index ae1cfe83fe..87d1aef9d8 100644
--- a/meta/packages/update-rc.d/update-rc.d_0.7.bb
+++ b/meta/packages/update-rc.d/update-rc.d_0.7.bb
@@ -1,7 +1,6 @@
 SECTION = "base"
 PRIORITY = "standard"
 DESCRIPTION = "Manage symlinks in /etc/rcN.d"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 S = "${WORKDIR}/update-rc.d"
 PR = "r0"
diff --git a/meta/packages/wireless-tools/wireless-tools_28-pre6.bb b/meta/packages/wireless-tools/wireless-tools_28-pre6.bb
index f230cd307b..ba7caf9fd8 100644
--- a/meta/packages/wireless-tools/wireless-tools_28-pre6.bb
+++ b/meta/packages/wireless-tools/wireless-tools_28-pre6.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
 HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/meta/packages/wireless-tools/wireless-tools_29-pre10.bb b/meta/packages/wireless-tools/wireless-tools_29-pre10.bb
index c961a25f83..170f67deeb 100644
--- a/meta/packages/wireless-tools/wireless-tools_29-pre10.bb
+++ b/meta/packages/wireless-tools/wireless-tools_29-pre10.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
 HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc b/meta/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc
index c2b51021f9..e75ce2e570 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc
+++ b/meta/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc
@@ -1,7 +1,6 @@
 SECTION = "kernel/userland"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb b/meta/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
index 0a8fc1bc66..365bcb78cc 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
+++ b/meta/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
 SECTION = "network"
 LICENSE = "GPL"
-MAINTAINER = "Holger Schurig"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "openssl"
 PR = "r3"
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb b/meta/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb
index 684d7da8eb..04561b7276 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb
+++ b/meta/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
 SECTION = "network"
 LICENSE = "GPL"
-MAINTAINER = "Holger Schurig"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "openssl"
 DEPENDS_mtx-1_append = "madwifi-modules"
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb b/meta/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
index 268255c39e..6d8efbe14c 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
+++ b/meta/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
 SECTION = "network"
 LICENSE = "GPL"
-MAINTAINER = "Holger Schurig"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "openssl"
 DEPENDS_mtx-1_append = "madwifi-modules"
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb b/meta/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb
index 236992f8f0..704efcac20 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb
+++ b/meta/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb
@@ -1,8 +1,6 @@
 DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
 SECTION = "network"
 LICENSE = "GPL"
-MAINTAINER = "Holger Schurig"
-MAINTAINER = "Eric Shattow <lucent@gmail.com>"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "gnutls madwifi-ng"
 
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/meta/packages/wpa-supplicant/wpa-supplicant_cvs.bb
index fd93eb8e54..db1395d76b 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant_cvs.bb
+++ b/meta/packages/wpa-supplicant/wpa-supplicant_cvs.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Client for Wi-Fi Protected Access (WPA)."
 SECTION = "network"
 LICENSE = "GPL"
-MAINTAINER = "Holger Schurig"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "openssl"
 PV = "0.0+cvs${SRCDATE}"
diff --git a/meta/packages/xextensions/xextensions_1.0.1.bb b/meta/packages/xextensions/xextensions_1.0.1.bb
index 134614bd0c..d776bfd54d 100644
--- a/meta/packages/xextensions/xextensions_1.0.1.bb
+++ b/meta/packages/xextensions/xextensions_1.0.1.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/libs"
 LICENSE= "BSD-X"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "various extension headers."
 
 SRC_URI = "${XLIBS_MIRROR}/xextensions-${PV}.tar.bz2"
diff --git a/meta/packages/xorg-app/xauth_cvs.bb b/meta/packages/xorg-app/xauth_cvs.bb
index a944d1d51d..169de7a797 100644
--- a/meta/packages/xorg-app/xauth_cvs.bb
+++ b/meta/packages/xorg-app/xauth_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 DEPENDS = "virtual/libx11 libxau libxmu libxext"
 DESCRIPTION = "X authority file utility"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 PR = "r2"
 
diff --git a/meta/packages/xorg-app/xdpyinfo_cvs.bb b/meta/packages/xorg-app/xdpyinfo_cvs.bb
index df31ba68d5..9a05f066ce 100644
--- a/meta/packages/xorg-app/xdpyinfo_cvs.bb
+++ b/meta/packages/xorg-app/xdpyinfo_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 DEPENDS = "virtual/libx11 libxext libxtst"
 DESCRIPTION = "X display information utility"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11/base"
 PR = "r1"
 
diff --git a/meta/packages/xorg-app/xhost_20040413.bb b/meta/packages/xorg-app/xhost_20040413.bb
index ed240dbba1..59e8f32964 100644
--- a/meta/packages/xorg-app/xhost_20040413.bb
+++ b/meta/packages/xorg-app/xhost_20040413.bb
@@ -3,7 +3,6 @@ LICENSE = "MIT"
 PV = "0.0+cvs${FIXEDSRCDATE}"
 DEPENDS = "virtual/libx11 libxext libxmu"
 DESCRIPTION = "server access control program for X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 PR = "r2"
 
diff --git a/meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
index a08ad7184d..e997ffc6a6 100644
--- a/meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
+++ b/meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
 DESCRIPTION = "Server access control program for X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "MIT"
 
 DEPENDS += " virtual/libx11 libxmu libxau"
diff --git a/meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb b/meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
index a08ad7184d..e997ffc6a6 100644
--- a/meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
 DESCRIPTION = "Server access control program for X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "MIT"
 
 DEPENDS += " virtual/libx11 libxmu libxau"
diff --git a/meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
index b671beb07b..856aae8e6c 100644
--- a/meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
+++ b/meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
 DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "MIT"
 
 DEPENDS += " virtual/libx11"
diff --git a/meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb b/meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
index 4fe4c0c4cc..da12303b23 100644
--- a/meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
 DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "MIT"
 
 DEPENDS += " virtual/libx11"
diff --git a/meta/packages/xorg-app/xmodmap_cvs.bb b/meta/packages/xorg-app/xmodmap_cvs.bb
index 7f45b28a89..e2b3847e6b 100644
--- a/meta/packages/xorg-app/xmodmap_cvs.bb
+++ b/meta/packages/xorg-app/xmodmap_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 PR = "r1"
 
diff --git a/meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
index bad78d3873..65f08f2bb6 100644
--- a/meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
+++ b/meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
 DESCRIPTION = "X server resource database utility"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "xrdb"
 
 DEPENDS += " libxmu virtual/libx11 libxext"
diff --git a/meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb b/meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
index d73890cc15..24a5ac9208 100644
--- a/meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
+++ b/meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
 DESCRIPTION = "X server resource database utility"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "xrdb"
 
 DEPENDS += " libxmu virtual/libx11 libxext"
diff --git a/meta/packages/xorg-app/xrdb_cvs.bb b/meta/packages/xorg-app/xrdb_cvs.bb
index 51a3fcd08a..1289a8cfce 100644
--- a/meta/packages/xorg-app/xrdb_cvs.bb
+++ b/meta/packages/xorg-app/xrdb_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 DEPENDS = "virtual/libx11 libxmu libxext"
 DESCRIPTION = "X server resource database utility"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 LICENSE = "xrdb"
 PR = "r2"
diff --git a/meta/packages/xorg-app/xset_20040817.bb b/meta/packages/xorg-app/xset_20040817.bb
index 90247fdb26..3b91812b94 100644
--- a/meta/packages/xorg-app/xset_20040817.bb
+++ b/meta/packages/xorg-app/xset_20040817.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "user preference utility for X"
 LICENSE = "MIT"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.0+cvs${FIXEDSRCDATE}"
 PR = "r1"
diff --git a/meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb
index b8b204e657..72c315c6a1 100644
--- a/meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb
+++ b/meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
 DESCRIPTION = "user preference utility for X"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 LICENSE = "MIT"
 
 DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp"
diff --git a/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb
index b8b204e657..72c315c6a1 100644
--- a/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb
+++ b/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
 DESCRIPTION = "user preference utility for X"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 LICENSE = "MIT"
 
 DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp"
diff --git a/meta/packages/xorg-lib/libice_6.3.3.bb b/meta/packages/xorg-lib/libice_6.3.3.bb
index e771161e59..3bbea635ee 100644
--- a/meta/packages/xorg-lib/libice_6.3.3.bb
+++ b/meta/packages/xorg-lib/libice_6.3.3.bb
@@ -1,7 +1,6 @@
 SECTION = "libs"
 LICENSE= "MIT"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "virtual/libx11"
 PROVIDES = "ice"
 DESCRIPTION = "X11 ICE library"
diff --git a/meta/packages/xorg-lib/libsm_6.0.3.bb b/meta/packages/xorg-lib/libsm_6.0.3.bb
index cd374649bb..620e4d8295 100644
--- a/meta/packages/xorg-lib/libsm_6.0.3.bb
+++ b/meta/packages/xorg-lib/libsm_6.0.3.bb
@@ -1,7 +1,6 @@
 SECTION = "libs"
 LICENSE = "MIT-X"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "virtual/libx11 libice"
 DESCRIPTION = "Session management library"
 PR = "r1"
diff --git a/meta/packages/xorg-lib/libx11_6.2.1.bb b/meta/packages/xorg-lib/libx11_6.2.1.bb
index ce57c42f7f..4e160ad286 100644
--- a/meta/packages/xorg-lib/libx11_6.2.1.bb
+++ b/meta/packages/xorg-lib/libx11_6.2.1.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/libs"
 LICENSE = "XFree86"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
 PROVIDES = "virtual/libx11"
 RPROVIDES = "virtual/libx11"
diff --git a/meta/packages/xorg-lib/libx11_cvs.bb b/meta/packages/xorg-lib/libx11_cvs.bb
index aaa052eba3..7b89c668dc 100644
--- a/meta/packages/xorg-lib/libx11_cvs.bb
+++ b/meta/packages/xorg-lib/libx11_cvs.bb
@@ -3,7 +3,6 @@ LICENSE = "XFree86"
 PR = "r6"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
 PROVIDES = "virtual/libx11"
 RPROVIDES = "virtual/libx11"
diff --git a/meta/packages/xorg-lib/libxau_0.1.1.bb b/meta/packages/xorg-lib/libxau_0.1.1.bb
index dc1a28171b..ef5eb9662e 100644
--- a/meta/packages/xorg-lib/libxau_0.1.1.bb
+++ b/meta/packages/xorg-lib/libxau_0.1.1.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/libs"
 LICENSE= "MIT"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto"
 PROVIDES = "xau"
 DESCRIPTION = "Authorization Protocol for X."
diff --git a/meta/packages/xorg-lib/libxau_cvs.bb b/meta/packages/xorg-lib/libxau_cvs.bb
index 518744816d..787bc290e7 100644
--- a/meta/packages/xorg-lib/libxau_cvs.bb
+++ b/meta/packages/xorg-lib/libxau_cvs.bb
@@ -3,7 +3,6 @@ LICENSE= "MIT"
 PR = "r1"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto"
 PROVIDES = "xau"
 DESCRIPTION = "Authorization Protocol for X."
diff --git a/meta/packages/xorg-lib/libxaw_7.0.2.bb b/meta/packages/xorg-lib/libxaw_7.0.2.bb
index 04f2855101..b55f2b8309 100644
--- a/meta/packages/xorg-lib/libxaw_7.0.2.bb
+++ b/meta/packages/xorg-lib/libxaw_7.0.2.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/libs"
 LICENSE = "MIT"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm"
 PROVIDES = "xaw"
 DESCRIPTION = "X Athena Widgets library"
diff --git a/meta/packages/xorg-lib/libxcursor_1.1.2.bb b/meta/packages/xorg-lib/libxcursor_1.1.2.bb
index 25744c7dca..156bd80f08 100644
--- a/meta/packages/xorg-lib/libxcursor_1.1.2.bb
+++ b/meta/packages/xorg-lib/libxcursor_1.1.2.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/libs"
 LICENSE= "BSD-X"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "X Cursor library"
 DEPENDS = "libxfixes"
 PR = "r2"
diff --git a/meta/packages/xorg-lib/libxdmcp_0.1.1.bb b/meta/packages/xorg-lib/libxdmcp_0.1.1.bb
index 19fba1529e..1fa11acaa5 100644
--- a/meta/packages/xorg-lib/libxdmcp_0.1.1.bb
+++ b/meta/packages/xorg-lib/libxdmcp_0.1.1.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/libs"
 LICENSE= "MIT"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto"
 PROVIDES = "xdmcp"
 DESCRIPTION = "X Display Manager Control Protocol library."
diff --git a/meta/packages/xorg-lib/libxdmcp_0.1.3.bb b/meta/packages/xorg-lib/libxdmcp_0.1.3.bb
index aa2736cdb2..20c4e5bd0c 100644
--- a/meta/packages/xorg-lib/libxdmcp_0.1.3.bb
+++ b/meta/packages/xorg-lib/libxdmcp_0.1.3.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/libs"
 PRIORITY = "optional"
 LICENSE= "MIT"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto"
 PROVIDES = "xdmcp"
 DESCRIPTION = "X Display Manager Control Protocol library."
diff --git a/meta/packages/xorg-lib/libxdmcp_cvs.bb b/meta/packages/xorg-lib/libxdmcp_cvs.bb
index 20b957b522..8f0833b402 100644
--- a/meta/packages/xorg-lib/libxdmcp_cvs.bb
+++ b/meta/packages/xorg-lib/libxdmcp_cvs.bb
@@ -3,7 +3,6 @@ LICENSE= "MIT"
 PR = "r1"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto"
 PROVIDES = "xdmcp"
 DESCRIPTION = "X Display Manager Control Protocol library."
diff --git a/meta/packages/xorg-lib/libxfont_1.4.2.bb b/meta/packages/xorg-lib/libxfont_1.4.2.bb
index 0cc45397fe..6053762a4e 100644
--- a/meta/packages/xorg-lib/libxfont_1.4.2.bb
+++ b/meta/packages/xorg-lib/libxfont_1.4.2.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/libs"
 LICENSE = "BSD-X"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto xtrans zlib"
 PROVIDES = "xfont"
 DESCRIPTION = "X font library (used by the X server)."
diff --git a/meta/packages/xorg-lib/libxfont_cvs.bb b/meta/packages/xorg-lib/libxfont_cvs.bb
index bd21e0fd12..d96fd87964 100644
--- a/meta/packages/xorg-lib/libxfont_cvs.bb
+++ b/meta/packages/xorg-lib/libxfont_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto xtrans zlib"
 PROVIDES = "xfont"
 DESCRIPTION = "X font library (used by the X server)."
diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb b/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
index eb4a6d54cf..36d05f77ce 100644
--- a/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
+++ b/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Xinerama library"
 LICENSE = "MIT"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "panoramixext xproto virtual/libx11 libxext"
 PROVIDES = "xinerama"
 
diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2.bb b/meta/packages/xorg-lib/libxinerama_1.0.2.bb
index 429c2fc4d0..3a3594c3ed 100644
--- a/meta/packages/xorg-lib/libxinerama_1.0.2.bb
+++ b/meta/packages/xorg-lib/libxinerama_1.0.2.bb
@@ -2,7 +2,6 @@ LICENSE = "MIT"
 DESCRIPTION = "Xinerama library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "panoramixext xproto virtual/libx11 libxext"
 PROVIDES = "xinerama"
 PR = "r1"
diff --git a/meta/packages/xorg-lib/libxpm_3.5.1.bb b/meta/packages/xorg-lib/libxpm_3.5.1.bb
index 8447cd3630..4e63c15ef9 100644
--- a/meta/packages/xorg-lib/libxpm_3.5.1.bb
+++ b/meta/packages/xorg-lib/libxpm_3.5.1.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/libs"
 LICENSE = "X-BSD"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto virtual/libx11"
 PROVIDES = "xpm"
 DESCRIPTION = "X Pixmap library."
diff --git a/meta/packages/xorg-lib/libxpm_cvs.bb b/meta/packages/xorg-lib/libxpm_cvs.bb
index 4d4d534e9a..df3e5f3c72 100644
--- a/meta/packages/xorg-lib/libxpm_cvs.bb
+++ b/meta/packages/xorg-lib/libxpm_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "X-BSD"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto virtual/libx11"
 PROVIDES = "xpm"
 DESCRIPTION = "X Pixmap library."
diff --git a/meta/packages/xorg-lib/libxres_1.0.1.bb b/meta/packages/xorg-lib/libxres_1.0.1.bb
index 3f0d32bfe4..58943c467e 100644
--- a/meta/packages/xorg-lib/libxres_1.0.1.bb
+++ b/meta/packages/xorg-lib/libxres_1.0.1.bb
@@ -1,5 +1,4 @@
 SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "virtual/libx11 xextensions libxext resourceext"
 PROVIDES = "xres"
 DESCRIPTION = "X Resource usage library."
diff --git a/meta/packages/xorg-lib/libxres_cvs.bb b/meta/packages/xorg-lib/libxres_cvs.bb
index a457d6c14f..02e023ee76 100644
--- a/meta/packages/xorg-lib/libxres_cvs.bb
+++ b/meta/packages/xorg-lib/libxres_cvs.bb
@@ -1,6 +1,5 @@
 PV = "0.0+cvs${SRCDATE}"
 SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "virtual/libx11 xextensions libxext resourceext"
 PROVIDES = "xres"
 DESCRIPTION = "X Resource usage library."
diff --git a/meta/packages/xorg-lib/libxt_0.1.5.bb b/meta/packages/xorg-lib/libxt_0.1.5.bb
index 9c31075285..b0d2d230d3 100644
--- a/meta/packages/xorg-lib/libxt_0.1.5.bb
+++ b/meta/packages/xorg-lib/libxt_0.1.5.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "virtual/libx11 libsm"
 PROVIDES = "xt"
 DESCRIPTION = "X Toolkit Intrinsics"
diff --git a/meta/packages/xorg-lib/xtrans_0.1.bb b/meta/packages/xorg-lib/xtrans_0.1.bb
index 8fee0d5089..f3fa0ddc38 100644
--- a/meta/packages/xorg-lib/xtrans_0.1.bb
+++ b/meta/packages/xorg-lib/xtrans_0.1.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/libs"
 LICENSE = "MIT"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "network API translation layer to \
 insulate X applications and libraries from OS \
 network vageries."
diff --git a/meta/packages/xorg-lib/xtrans_cvs.bb b/meta/packages/xorg-lib/xtrans_cvs.bb
index 9714f4017b..73a0e4b8e1 100644
--- a/meta/packages/xorg-lib/xtrans_cvs.bb
+++ b/meta/packages/xorg-lib/xtrans_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "network API translation layer to \
 insulate X applications and libraries from OS \
 network vageries."
diff --git a/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb b/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
index 594a351155..55bc32b768 100644
--- a/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
+++ b/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
@@ -1,6 +1,5 @@
 LICENSE= "MIT"
 SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "X protocol and ancillary headers."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto;date=20050226"
diff --git a/meta/packages/xorg-proto/xproto_6.6.2.bb b/meta/packages/xorg-proto/xproto_6.6.2.bb
index b5cf751053..1f01c0979a 100644
--- a/meta/packages/xorg-proto/xproto_6.6.2.bb
+++ b/meta/packages/xorg-proto/xproto_6.6.2.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/libs"
 LICENSE= "MIT"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "X protocol and ancillary headers."
 
 SRC_URI = "${XLIBS_MIRROR}/xproto-${PV}.tar.gz"
diff --git a/meta/packages/xorg-proto/xproto_cvs.bb b/meta/packages/xorg-proto/xproto_cvs.bb
index 1d9c96c87d..f42fa1bb43 100644
--- a/meta/packages/xorg-proto/xproto_cvs.bb
+++ b/meta/packages/xorg-proto/xproto_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "MIT"
 SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "X protocol and ancillary headers."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto"
diff --git a/meta/packages/xournal/xournal_0.2.bb b/meta/packages/xournal/xournal_0.2.bb
index cd85a01f37..327720777f 100644
--- a/meta/packages/xournal/xournal_0.2.bb
+++ b/meta/packages/xournal/xournal_0.2.bb
@@ -1,6 +1,5 @@
 HOMEPAGE = "http://www-math.mit.edu/~auroux/software/xournal/"
 DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "gtk+ libgnomecanvas"
 SECTION = "x11"
 LICENSE = "GPL"
diff --git a/meta/packages/xtscal/xtscal_0.6.3.bb b/meta/packages/xtscal/xtscal_0.6.3.bb
index 70666f1fbf..d31283310b 100644
--- a/meta/packages/xtscal/xtscal_0.6.3.bb
+++ b/meta/packages/xtscal/xtscal_0.6.3.bb
@@ -1,6 +1,5 @@
 LICENSE = "GPL"
 DESCRIPTION = "Touchscreen calibration utility"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11/base"
 
 DEPENDS = "libx11 libxft libxrandr xcalibrate"
diff --git a/meta/packages/zile/zile_1.7+2.0beta6.bb b/meta/packages/zile/zile_1.7+2.0beta6.bb
index 1a4f7955fb..74d832eef3 100644
--- a/meta/packages/zile/zile_1.7+2.0beta6.bb
+++ b/meta/packages/zile/zile_1.7+2.0beta6.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Zile is a very small emacs-like editor."
 HOMEPAGE = "http://zile.sourceforge.net/"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "optional"
 SECTION = "console/editors"
 PR = "r1"
diff --git a/meta/packages/zlib/zlib_1.1.4.bb b/meta/packages/zlib/zlib_1.1.4.bb
index 86066e77f5..768b1bc91a 100644
--- a/meta/packages/zlib/zlib_1.1.4.bb
+++ b/meta/packages/zlib/zlib_1.1.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Zlib Compression Library"
 SECTION = "libs"
 PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://www.gzip.org/zlib/"
 LICENSE = "zlib"
 PR = "r1"
diff --git a/meta/packages/zlib/zlib_1.2.2.bb b/meta/packages/zlib/zlib_1.2.2.bb
index 08c97c2f25..1f543f04b4 100644
--- a/meta/packages/zlib/zlib_1.2.2.bb
+++ b/meta/packages/zlib/zlib_1.2.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Zlib Compression Library"
 SECTION = "libs"
 PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://www.gzip.org/zlib/"
 LICENSE = "zlib"
 PR = "r6"
diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb
index 1d342f51d1..6bb34ceaf0 100644
--- a/meta/packages/zlib/zlib_1.2.3.bb
+++ b/meta/packages/zlib/zlib_1.2.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Zlib Compression Library"
 SECTION = "libs"
 PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://www.gzip.org/zlib/"
 LICENSE = "zlib"