From: Koen Kooi <koen@openembedded.org>
Date: Tue, 10 Oct 2006 10:26:16 +0000 (+0000)
Subject: Remove MAINTAINER fields from recipes, add MAINTAINER file to replace them.
X-Git-Tag: Release-2010-05/1~9453^2~598
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7814da98a7630811db9fc24db9ae3c81588ca113;p=openembedded.git

Remove MAINTAINER fields from recipes, add MAINTAINER file to replace them.
see email thread at http://lists.openembedded.org/pipermail/openembedded-devel/2006-October/000523.html for details
---

diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644
index 0000000000..57191edd82
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1,8 @@
+OpenEmbedded Maintainers file. Please put you full name and email-address here for the areas of OE you want to support.
+
+
+Koen Kooi <koen@openembedded.org>
+	MACHINE: h2200, ipaq-pxa270, efika, ep93xx, netbook-pro machines
+	DISTRO: Angstrom distribution
+	recipes: abiword, bootchart, dia, farsight, freeciv, fuse, galago, geda, gimp, gnome stuff, gnumeric, (g)obby, gpe stuff, imposter, inkscape, matchbox stuff, opensync stuff, telepathy, tilibs, xchat, xournal. 
+
diff --git a/classes/e.bbclass b/classes/e.bbclass
index afd9b6d2b3..008e3f2dc1 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -1,4 +1,3 @@
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 HOMEPAGE = "http://www.enlightenment.org"
 SECTION = "e/apps"
 
diff --git a/classes/gpe.bbclass b/classes/gpe.bbclass
index c9268dea9c..a9ddec3b53 100644
--- a/classes/gpe.bbclass
+++ b/classes/gpe.bbclass
@@ -3,7 +3,6 @@ GPE_TARBALL_SUFFIX ?= "gz"
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}"
 FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry"
 SECTION ?= "gpe"
-MAINTAINER ?= "GPE Team <gpe@handhelds.org>"
 
 inherit gettext
 
diff --git a/conf/documentation.conf b/conf/documentation.conf
index feb572db46..9996b27d48 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -57,7 +57,7 @@ PRIORITY[doc] = "Importance of package, default values are 'optional' or 'needed
 DESCRIPTION[doc] = "A small description of the package."
 LICENSE[doc] = "The license of the resulting package e.g. GPL"
 AUTHOR[doc] = "The author of the files installed."
-MAINTAINER[doc] = "Maintainer of the .bb file and the resulting package."
+MAINTAINER[doc] = "Distributions can put this in their .conf file to add their contact information into packages, this is not valid inside recipes"
 HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net."
 
 
diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py
index 41264a56e3..7170af08bb 100755
--- a/contrib/oe-stylize.py
+++ b/contrib/oe-stylize.py
@@ -33,7 +33,6 @@ OE_vars = [
     'HOMEPAGE',
     'SECTION',
     'PRIORITY',
-    'MAINTAINER',
     'LICENSE',
     'DEPENDS',
     'RDEPENDS',
diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb
index 567cc3a414..d488820620 100644
--- a/packages/abiword/abiword-plugins_2.4.5.bb
+++ b/packages/abiword/abiword-plugins_2.4.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
 SECTION = "gnome/office"
 HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE="GPLv2"
 
 DEPENDS     = "libwpd librsvg goffice poppler"
diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc
index 495bafcbe6..ac9a39515a 100644
--- a/packages/abiword/abiword.inc
+++ b/packages/abiword/abiword.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
 SECTION = "gnome/office"
 HOMEPAGE = "http://www.abiword.org""
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 
 DEPENDS     = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2"
diff --git a/packages/addons/devshell.bb b/packages/addons/devshell.bb
index 6d5d53a1a2..d8116dd48b 100644
--- a/packages/addons/devshell.bb
+++ b/packages/addons/devshell.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Runs a shell in an environment as emitted by BitBake to execute tasks"
 LICENSE = "GPL"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 PR = "r1"
 
 inherit autotools pkgconfig
diff --git a/packages/aircrack/aircrack_2.1.bb b/packages/aircrack/aircrack_2.1.bb
index 82cee083b7..b9b3a0c14a 100644
--- a/packages/aircrack/aircrack_2.1.bb
+++ b/packages/aircrack/aircrack_2.1.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION = "Aircrack is a set of tools for wep key statistical cracking"
 HOMEPAGE = "http://www.cr0.net:8040/code/network/aircrack/"
 LICENSE = "GPLv2"
-MAINTAINER = "Olivier Fauchon <olivier@aixmarseille.com>"
 DEPENDS = ""
 PV="2.1"
 PR="r0"
diff --git a/packages/aircrack/aircrack_2.41.bb b/packages/aircrack/aircrack_2.41.bb
index c1d3252aae..3e4d2a9b31 100644
--- a/packages/aircrack/aircrack_2.41.bb
+++ b/packages/aircrack/aircrack_2.41.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION = "Aircrack is a set of tools for wep key statistical cracking"
 HOMEPAGE = "http://www.cr0.net:8040/code/network/aircrack/"
 LICENSE = "GPLv2"
-MAINTAINER = "Rick Farina <sidhayn@hotmail.com>"
 DEPENDS = ""
 PR="r0"
 
diff --git a/packages/albumshaper/albumshaper_2.1.bb b/packages/albumshaper/albumshaper_2.1.bb
index 6bfd7e6812..b640cb6fdd 100644
--- a/packages/albumshaper/albumshaper_2.1.bb
+++ b/packages/albumshaper/albumshaper_2.1.bb
@@ -4,7 +4,6 @@ Album Shaper embraces open formats like XML, JPEG, and XSLT, while supporting Wi
 users who speak a multitude of languages around the world."
 HOMEPAGE = "http://albumshaper.sourceforge.net"
 AUTHOR = "Will Stokes"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "libxml2 libxslt jpeg"
 
diff --git a/packages/aliens/aliens_1.0.0.bb b/packages/aliens/aliens_1.0.0.bb
index 3b8399aac5..630654899d 100644
--- a/packages/aliens/aliens_1.0.0.bb
+++ b/packages/aliens/aliens_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Classic Arcade Shooter for Qt/Embedded based palmtop environments"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 APPNAME = "aliens.sdl"
 APPTYPE = "binary"
diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
index 97d3f9ac31..36fec31288 100644
--- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb
+++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
@@ -2,7 +2,6 @@
 BROKEN = "1"
 
 DESCRIPTION = "Alsa Drivers"
-MAINTAINER = "Pigi"
 SECTION = "base"
 LICENSE = "GPL"
 PR = "r6"
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 83382f57a0..1970604222 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -6,7 +6,6 @@
 # Date: 07-May-06
 
 DESCRIPTION = "The altboot bootmanager"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 LICENSE = "GPL"
 
diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb
index c5f641f11f..8c9b21e232 100644
--- a/packages/altboot/altboot_1.0.5.bb
+++ b/packages/altboot/altboot_1.0.5.bb
@@ -7,7 +7,6 @@
 # Date: 21-Feb-06
 
 DESCRIPTION = "The altboot bootmanager"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 LICENSE = "GPL"
 
diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb
index 245cf2a426..58b6a9052a 100644
--- a/packages/altboot/altboot_1.0.8.bb
+++ b/packages/altboot/altboot_1.0.8.bb
@@ -7,7 +7,6 @@
 # Date: 21-Feb-06
 
 DESCRIPTION = "The altboot bootmanager"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 LICENSE = "GPL"
 
diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb
index f6aaddd55e..8c2fd9cc09 100644
--- a/packages/angstrom/angstrom-bootmanager-image.bb
+++ b/packages/angstrom/angstrom-bootmanager-image.bb
@@ -1,6 +1,5 @@
 #Angstrom bootmanager image
 LICENSE = MIT
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 PR = "r0"
 
 DEPENDS = "task-angstrom"
diff --git a/packages/angstrom/angstrom-bootmanager.bb b/packages/angstrom/angstrom-bootmanager.bb
index a863256910..5c5ee90f02 100644
--- a/packages/angstrom/angstrom-bootmanager.bb
+++ b/packages/angstrom/angstrom-bootmanager.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "A graphical Boot Manager for the Ångström Linux Distribution"
 AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-MAINTAINER = "${AUTHOR}"
 SECTION = "base"
 DEPENDS = "evas-fb ecore-fb esmart-fb imlib2-fb edje efl++-fb"
 #RDEPENDS = "libefl++0"
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
index 5a732c67a6..5da104aa18 100644
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -1,6 +1,5 @@
 #Angstrom bootstrap image
 LICENSE = MIT
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 PR = "r2"
 
 DEPENDS = "task-angstrom task-base"
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
index c603e69740..25e7a80835 100644
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -1,6 +1,5 @@
 #Angstrom GPE image
 LICENSE = MIT
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 PR = "r3"
 
 PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb
index 34422da237..45fadcb3d1 100644
--- a/packages/angstrom/angstrom-version.bb
+++ b/packages/angstrom/angstrom-version.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = ${DISTRO_VERSION}
 
 do_compile() {
diff --git a/packages/antlr/antlr_2.7.5.bb b/packages/antlr/antlr_2.7.5.bb
index b1a2b2cfaf..f61b3a0b87 100644
--- a/packages/antlr/antlr_2.7.5.bb
+++ b/packages/antlr/antlr_2.7.5.bb
@@ -3,7 +3,6 @@ language tool that provides a framework for constructing recognizers, \
 compilers, and translators from grammatical descriptions containing \
 Java, C#, C++, or Python actions."
 LICENSE = "PD"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "optional"
 SECTION = "devel"
 # DEPENDS += "virtual/java"
diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb
index 8afb375912..7f714724db 100644
--- a/packages/apache/apache_2.0.54.bb
+++ b/packages/apache/apache_2.0.54.bb
@@ -1,4 +1,3 @@
-MAINTAINER="David Karlstrom <daka@nslu2-linux.org>"
 SECTION = "net"
 DEPENDS = "openssl expat libpcre"
 
diff --git a/packages/apex/apex_1.2.19.bb b/packages/apex/apex_1.2.19.bb
index 6ef684935c..027dfaa194 100644
--- a/packages/apex/apex_1.2.19.bb
+++ b/packages/apex/apex_1.2.19.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "APEX Boot Loader"
 SECTION = ""
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/apex/apex_1.4.5.bb b/packages/apex/apex_1.4.5.bb
index 97e20ec271..35d772aa0b 100644
--- a/packages/apex/apex_1.4.5.bb
+++ b/packages/apex/apex_1.4.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "APEX Boot Loader"
 SECTION = ""
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/application-registry/application-registry_0.1.bb b/packages/application-registry/application-registry_0.1.bb
index 872b3bb86a..9fe339d566 100644
--- a/packages/application-registry/application-registry_0.1.bb
+++ b/packages/application-registry/application-registry_0.1.bb
@@ -3,7 +3,6 @@ PR = "r3"
 DESCRIPTION = "additional application registry files"
 DEPENDS = "shared-mime-info"
 RDEPENDS = "shared-mime-info"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "MIT"
diff --git a/packages/apr/apr-util_0.9.12.bb b/packages/apr/apr-util_0.9.12.bb
index e88298fafe..6938624988 100644
--- a/packages/apr/apr-util_0.9.12.bb
+++ b/packages/apr/apr-util_0.9.12.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Apache Portable Runtime (APR) companion library"
 SECTION = "libs"
 DEPENDS = "apr expat gdbm"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "Apache"
 HOMEPAGE = "http://apr.apache.org"
 PR = "r0"
diff --git a/packages/apr/apr_0.9.12.bb b/packages/apr/apr_0.9.12.bb
index 5c287ace0f..f1de4528ff 100644
--- a/packages/apr/apr_0.9.12.bb
+++ b/packages/apr/apr_0.9.12.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Apache Portable Runtime (APR) library"
 SECTION = "libs"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "Apache"
 HOMEPAGE = "http://apr.apache.org"
 PR = "r0"
diff --git a/packages/ark3116/ark3116_0.4.1.bb b/packages/ark3116/ark3116_0.4.1.bb
index 025eb3ce77..efcadfaf94 100644
--- a/packages/ark3116/ark3116_0.4.1.bb
+++ b/packages/ark3116/ark3116_0.4.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Driver for usb serial cables based upon ArkMicroChips 3116s chip"
 HOMEPAGE = "http://avr.auctionant.de/ark3116_linux_driver/"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 PR = "r2"
 RRECOMMENDS = "kernel-module-usbserial"
diff --git a/packages/atftp/atftp_0.7.bb b/packages/atftp/atftp_0.7.bb
index 67dd716a76..23bdfaf64b 100644
--- a/packages/atftp/atftp_0.7.bb
+++ b/packages/atftp/atftp_0.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Advanced TFTP server and client"
 SECTION = "network"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 HOMEPAGE = "http://packages.debian.org/atftp"
 LICENSE = "GPL"
 PR = "r2"
diff --git a/packages/atk/atk_1.6.0.bb b/packages/atk/atk_1.6.0.bb
index f1429a43e0..1511da84d0 100644
--- a/packages/atk/atk_1.6.0.bb
+++ b/packages/atk/atk_1.6.0.bb
@@ -2,7 +2,6 @@ DEPENDS = "glib-2.0"
 DESCRIPTION = "An accessibility toolkit for GNOME."
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 LICENSE = "LGPL"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2 \
diff --git a/packages/atk/atk_1.6.1.bb b/packages/atk/atk_1.6.1.bb
index bfcc33cf40..9344d747b2 100644
--- a/packages/atk/atk_1.6.1.bb
+++ b/packages/atk/atk_1.6.1.bb
@@ -2,7 +2,6 @@ DEPENDS = "glib-2.0 gtk-doc"
 DESCRIPTION = "An accessibility toolkit for GNOME."
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 LICENSE = "LGPL"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2"
diff --git a/packages/atk/atk_1.9.0.bb b/packages/atk/atk_1.9.0.bb
index 51f03f2568..2dd743e146 100644
--- a/packages/atk/atk_1.9.0.bb
+++ b/packages/atk/atk_1.9.0.bb
@@ -2,7 +2,6 @@ DEPENDS = "glib-2.0 gtk-doc"
 DESCRIPTION = "An accessibility toolkit for GNOME."
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 LICENSE = "LGPL"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/atk-${PV}.tar.bz2"
diff --git a/packages/avahi/avahi_0.6.10.bb b/packages/avahi/avahi_0.6.10.bb
index 803266b6b3..39ef299351 100644
--- a/packages/avahi/avahi_0.6.10.bb
+++ b/packages/avahi/avahi_0.6.10.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/packages/avahi/avahi_0.6.11.bb b/packages/avahi/avahi_0.6.11.bb
index cc32ad883f..6132fda504 100644
--- a/packages/avahi/avahi_0.6.11.bb
+++ b/packages/avahi/avahi_0.6.11.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/packages/avahi/avahi_0.6.12.bb b/packages/avahi/avahi_0.6.12.bb
index 44e7c543ae..97fe491577 100644
--- a/packages/avahi/avahi_0.6.12.bb
+++ b/packages/avahi/avahi_0.6.12.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 = "r2"
 
diff --git a/packages/avahi/avahi_0.6.13.bb b/packages/avahi/avahi_0.6.13.bb
index 0898bf036c..a758997b4c 100644
--- a/packages/avahi/avahi_0.6.13.bb
+++ b/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/packages/avahi/avahi_0.6.14.bb b/packages/avahi/avahi_0.6.14.bb
index c80c956343..2b5d56fffd 100644
--- a/packages/avahi/avahi_0.6.14.bb
+++ b/packages/avahi/avahi_0.6.14.bb
@@ -3,7 +3,6 @@ AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://avahi.org"
 SECTION = "network"
 PRIORITY = "optional"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE = "GPL"
 
 DEPENDS = "expat libdaemon dbus"
diff --git a/packages/avahi/avahi_0.6.5.bb b/packages/avahi/avahi_0.6.5.bb
index f1a69a0451..4e27d655b0 100644
--- a/packages/avahi/avahi_0.6.5.bb
+++ b/packages/avahi/avahi_0.6.5.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"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
diff --git a/packages/avahi/avahi_0.6.8.bb b/packages/avahi/avahi_0.6.8.bb
index 95c930d8e8..828ea4a39a 100644
--- a/packages/avahi/avahi_0.6.8.bb
+++ b/packages/avahi/avahi_0.6.8.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"
 
 DEPENDS = "expat libdaemon dbus"
diff --git a/packages/avetanabt/avetanabt_20060413.bb b/packages/avetanabt/avetanabt_20060413.bb
index 8472e0e0ce..b04a9e5552 100644
--- a/packages/avetanabt/avetanabt_20060413.bb
+++ b/packages/avetanabt/avetanabt_20060413.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "avetanaBT: Bluetooth API implementation for Java (JSR-82)"
 SECTION = "devel"
 DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs classpath"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
 
diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb
index c25699caf0..b0deab2a42 100644
--- a/packages/avetanabt/avetanabt_cvs.bb
+++ b/packages/avetanabt/avetanabt_cvs.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "avetanaBT: Bluetooth API implementation for Java (JSR-82)"
 SECTION = "devel"
 DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs classpath"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
 
diff --git a/packages/bacula/bacula-client_1.38.11.bb b/packages/bacula/bacula-client_1.38.11.bb
index 474f6110c3..2276b5bfff 100644
--- a/packages/bacula/bacula-client_1.38.11.bb
+++ b/packages/bacula/bacula-client_1.38.11.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Bacula filedaemon is the client to backup your device using Bacula a network based backup program"
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "Bastian Ballmann <balle@chaostal.de>"
 HOMEPAGE = "http://www.bacula.org"
 LICENSE = "GPL"
 PR="r0"
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index d4c03bdefe..9dbd4e81d1 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -147,7 +147,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/packages/bazaar/bazaar_1.2.bb b/packages/bazaar/bazaar_1.2.bb
index 9309a7176b..e64b442733 100644
--- a/packages/bazaar/bazaar_1.2.bb
+++ b/packages/bazaar/bazaar_1.2.bb
@@ -11,7 +11,6 @@ DEPENDS += "neon"
 DESCRIPTION = "bazaar is an implementation of GNU Arch in C, based on tla."
 HOMEPAGE = "http://bazaar.canonical.com/"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "optional"
 SECTION = "devel"
 PR = "r2"
diff --git a/packages/beecrypt/beecrypt_3.1.0.bb b/packages/beecrypt/beecrypt_3.1.0.bb
index 1c67b38345..3187b9b12a 100644
--- a/packages/beecrypt/beecrypt_3.1.0.bb
+++ b/packages/beecrypt/beecrypt_3.1.0.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION="Beecrypt is a general-purpose cryptography library."
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz"
 
 inherit autotools
diff --git a/packages/beep/beep_1.2.2.bb b/packages/beep/beep_1.2.2.bb
index a7f9ca52b0..cb05d7920f 100644
--- a/packages/beep/beep_1.2.2.bb
+++ b/packages/beep/beep_1.2.2.bb
@@ -3,7 +3,6 @@
 DESCRIPTION = "A console utility to make a beep noise"
 SECTION = "console/utils"
 LICENSE = "GPL"
-MAINTAINER = "John Bowler <jbowler@nslu2-linux.org>"
 PR = "r2"
 DEPENDS = "install-native"
 
diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb
index c0477bd4fc..34b79ec1e9 100644
--- a/packages/billiardz/billiardz_0.1.4.bb
+++ b/packages/billiardz/billiardz_0.1.4.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Billiard Game for Qt/Embedded based palmtop environments w/ SDL."
 HOMEPAGE = "http://www.chipx86.com/projects/billiardz/"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "libsdl-qpe libsdl-image"
 PR = "r2"
diff --git a/packages/bind/bind_9.3.1.bb b/packages/bind/bind_9.3.1.bb
index 1853d392b1..29112ff311 100644
--- a/packages/bind/bind_9.3.1.bb
+++ b/packages/bind/bind_9.3.1.bb
@@ -1,7 +1,6 @@
 DEPENDS = "openssl"
 RPEDENDS = ""
 DESCRIPTION = "ISC Internet Domain Name Server"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.1/bind-9.3.1.tar.gz \
diff --git a/packages/binutils/binutils_2.14.90.0.6.bb b/packages/binutils/binutils_2.14.90.0.6.bb
index b93c5f5fe1..4a6078994e 100644
--- a/packages/binutils/binutils_2.14.90.0.6.bb
+++ b/packages/binutils/binutils_2.14.90.0.6.bb
@@ -6,7 +6,6 @@ PR = "r3"
 DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
diff --git a/packages/binutils/binutils_2.14.90.0.7.bb b/packages/binutils/binutils_2.14.90.0.7.bb
index 1afdcb560f..efad9f531a 100644
--- a/packages/binutils/binutils_2.14.90.0.7.bb
+++ b/packages/binutils/binutils_2.14.90.0.7.bb
@@ -4,7 +4,6 @@ inherit autotools gettext
 DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 PR = "r4"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
diff --git a/packages/binutils/binutils_2.15.94.0.1.bb b/packages/binutils/binutils_2.15.94.0.1.bb
index 43ac3db2ae..9aa1b050d3 100644
--- a/packages/binutils/binutils_2.15.94.0.1.bb
+++ b/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/packages/binutils/binutils_2.16.91.0.6.bb b/packages/binutils/binutils_2.16.91.0.6.bb
index 268680cb53..680730d5eb 100644
--- a/packages/binutils/binutils_2.16.91.0.6.bb
+++ b/packages/binutils/binutils_2.16.91.0.6.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 = "r1"
 
 # glibc 2.3 has issues with this version
diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb
index dbb4b94d2e..c56f227d58 100644
--- a/packages/binutils/binutils_2.16.bb
+++ b/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/packages/binutils/binutils_csl-arm-20050416.bb b/packages/binutils/binutils_csl-arm-20050416.bb
index 687a46285e..a9e3dfd5b9 100644
--- a/packages/binutils/binutils_csl-arm-20050416.bb
+++ b/packages/binutils/binutils_csl-arm-20050416.bb
@@ -4,7 +4,6 @@ inherit autotools gettext
 DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
 PV = "2.15.99+csl-arm+cvs20050416"
 PR = "r1"
diff --git a/packages/binutils/binutils_csl-arm-20050603.bb b/packages/binutils/binutils_csl-arm-20050603.bb
index 575a3b93f5..5e07aafd4f 100644
--- a/packages/binutils/binutils_csl-arm-20050603.bb
+++ b/packages/binutils/binutils_csl-arm-20050603.bb
@@ -4,7 +4,6 @@ inherit autotools gettext
 DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
 PV = "2.15.99+csl-arm+cvs20050603"
 PR = "r1"
diff --git a/packages/binutils/binutils_cvs.bb b/packages/binutils/binutils_cvs.bb
index ecd2d634e1..35291661f2 100644
--- a/packages/binutils/binutils_cvs.bb
+++ b/packages/binutils/binutils_cvs.bb
@@ -4,7 +4,6 @@ inherit autotools gettext
 DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
 PV = "0.0+cvs${SRCDATE}"
 PR = "r3"
diff --git a/packages/bl/bl_cvs.bb b/packages/bl/bl_cvs.bb
index 099f739656..11d338bb6e 100644
--- a/packages/bl/bl_cvs.bb
+++ b/packages/bl/bl_cvs.bb
@@ -2,7 +2,6 @@ SECTION = "base"
 LICENSE= "GPL"
 PV = "0.0+cvs${SRCDATE}"
 DESCRIPTION = "Command line tool for iPaq backlight control"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/h3600_test \
            file://nokernelheader.patch;patch=1;pnum=0 \
diff --git a/packages/bluesnarfer/bluesnarfer.bb b/packages/bluesnarfer/bluesnarfer.bb
index 48f4484cff..43d807f828 100644
--- a/packages/bluesnarfer/bluesnarfer.bb
+++ b/packages/bluesnarfer/bluesnarfer.bb
@@ -1,6 +1,5 @@
 SECTION = "net/misc"
 DESCRIPTION = "Bluetooth cellphone information gatherer"
-MAINTAINER = "Bob Davies (tyggerbob@gmail.com)"
 PV = "0.1"
 SRC_URI = "http://www.remote-exploit.org/images/a/a0/Bluesnarfer.tar.gz"
 
diff --git a/packages/boa/boa_0.94.13.bb b/packages/boa/boa_0.94.13.bb
index 215533e26d..7dc783210e 100644
--- a/packages/boa/boa_0.94.13.bb
+++ b/packages/boa/boa_0.94.13.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Lightweight and High Performance WebServer"
 SECTION = "console/network"
 RPROVIDES = "httpd"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/bonnie/bonnie++_1.03a.bb b/packages/bonnie/bonnie++_1.03a.bb
index b8aae121e5..46d259af78 100644
--- a/packages/bonnie/bonnie++_1.03a.bb
+++ b/packages/bonnie/bonnie++_1.03a.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION="Tests large file IO and creation/deletion of small files."
 LICENSE="GPL"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 
 
 SRC_URI="${SOURCEFORGE_MIRROR}/bonnie/${PN}-${PV}.tgz"
diff --git a/packages/boost/boost-jam-native_3.1.11.bb b/packages/boost/boost-jam-native_3.1.11.bb
index cf9f2317c8..843f912f46 100644
--- a/packages/boost/boost-jam-native_3.1.11.bb
+++ b/packages/boost/boost-jam-native_3.1.11.bb
@@ -5,7 +5,6 @@
 # thousands of programmers across a broad spectrum of applications.
 DESCRIPTION = "Make system for boost (native)"
 HOMEPAGE = "http://www.boost.org/"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "Boost Software License"
diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb
index db30f95a69..c409022fae 100644
--- a/packages/boost/boost_1.33.0.bb
+++ b/packages/boost/boost_1.33.0.bb
@@ -5,7 +5,6 @@
 # thousands of programmers across a broad spectrum of applications.
 DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
 HOMEPAGE = "http://www.boost.org/"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "libs"
 DEPENDS = "boost-jam-native zlib"
 PRIORITY = "optional"
diff --git a/packages/bootchart/bootchart_0.9.bb b/packages/bootchart/bootchart_0.9.bb
index abbdda4488..44fd3f45fa 100644
--- a/packages/bootchart/bootchart_0.9.bb
+++ b/packages/bootchart/bootchart_0.9.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Bootchart is a tool for performance analysis and visualization of the GNU/Linux boot process."
 LICENSE = "GPLv2"
 HOMEPAGE = "http://www.bootchart.org/"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 PR = "r1"
 
 #this only installs the loggers, you will need to run the renderers on your workstation 
diff --git a/packages/brickout/brickout_2002.06.09.bb b/packages/brickout/brickout_2002.06.09.bb
index 891b615331..916e9f7279 100644
--- a/packages/brickout/brickout_2002.06.09.bb
+++ b/packages/brickout/brickout_2002.06.09.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Clone of the classic arcade game Asteroids for Qt/Embedded based palmtop environments w/ SDL"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "libsdl-qpe libsdl-mixer libsdl-image"
 PR = "r4"
diff --git a/packages/btsco/btsco_0.41.bb b/packages/btsco/btsco_0.41.bb
index 5ebea64e1a..04c8ae16ff 100644
--- a/packages/btsco/btsco_0.41.bb
+++ b/packages/btsco/btsco_0.41.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Bluetooth-alsa headset tool"
 HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/"
 LICENSE = "GPL"
-MAINTAINER = "Robert Woerle <robert@linuxdevelopment.de>"
 DEPENDS = "alsa-lib bluez-libs"
 PR = "r2"
 
diff --git a/packages/btsco/btsco_0.42.bb b/packages/btsco/btsco_0.42.bb
index 8411046e57..005f3715f5 100644
--- a/packages/btsco/btsco_0.42.bb
+++ b/packages/btsco/btsco_0.42.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Bluetooth-alsa headset tool"
 HOMEPAGE = "http://bluetooth-alsa.sourceforge.net/"
 LICENSE = "GPL"
-MAINTAINER = "Robert Woerle <robert@linuxdevelopment.de>"
 DEPENDS = "alsa-lib bluez-libs"
 PR = "r0"
 
diff --git a/packages/bwmon/bwmon_1.3.bb b/packages/bwmon/bwmon_1.3.bb
index 8f5d5f4e3b..bc08aa7568 100644
--- a/packages/bwmon/bwmon_1.3.bb
+++ b/packages/bwmon/bwmon_1.3.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "The Linux bandwidth monitor"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
 PR = "r1"
diff --git a/packages/cairo/cairo_0.5.0.bb b/packages/cairo/cairo_0.5.0.bb
index c819b2ef46..8ec642f38d 100644
--- a/packages/cairo/cairo_0.5.0.bb
+++ b/packages/cairo/cairo_0.5.0.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 # DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
 DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
diff --git a/packages/cairo/cairo_0.5.2.bb b/packages/cairo/cairo_0.5.2.bb
index c819b2ef46..8ec642f38d 100644
--- a/packages/cairo/cairo_0.5.2.bb
+++ b/packages/cairo/cairo_0.5.2.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 # DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
 DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
diff --git a/packages/cairo/cairo_0.9.2.bb b/packages/cairo/cairo_0.9.2.bb
index d414a35019..cfbb18ed0e 100644
--- a/packages/cairo/cairo_0.9.2.bb
+++ b/packages/cairo/cairo_0.9.2.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb
index 9f8425c03f..0260c267dd 100644
--- a/packages/cairo/cairo_1.0.0.bb
+++ b/packages/cairo/cairo_1.0.0.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb
index 9f8425c03f..0260c267dd 100644
--- a/packages/cairo/cairo_1.2.4.bb
+++ b/packages/cairo/cairo_1.2.4.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
diff --git a/packages/cairo/cairo_cvs.bb b/packages/cairo/cairo_cvs.bb
index 2498b585f9..ea20009e34 100644
--- a/packages/cairo/cairo_cvs.bb
+++ b/packages/cairo/cairo_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 # DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
 DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
diff --git a/packages/cairo/libsvg-cairo_0.1.5.bb b/packages/cairo/libsvg-cairo_0.1.5.bb
index 83c4428a2f..438a630064 100644
--- a/packages/cairo/libsvg-cairo_0.1.5.bb
+++ b/packages/cairo/libsvg-cairo_0.1.5.bb
@@ -1,7 +1,6 @@
 SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libsvg cairo"
 DESCRIPTION = "SVG rendering library"
 
diff --git a/packages/cairo/libsvg-cairo_0.1.6.bb b/packages/cairo/libsvg-cairo_0.1.6.bb
index 83c4428a2f..438a630064 100644
--- a/packages/cairo/libsvg-cairo_0.1.6.bb
+++ b/packages/cairo/libsvg-cairo_0.1.6.bb
@@ -1,7 +1,6 @@
 SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libsvg cairo"
 DESCRIPTION = "SVG rendering library"
 
diff --git a/packages/cairo/libsvg-cairo_20050601.bb b/packages/cairo/libsvg-cairo_20050601.bb
index 2a49ec52ba..7a1f35135a 100644
--- a/packages/cairo/libsvg-cairo_20050601.bb
+++ b/packages/cairo/libsvg-cairo_20050601.bb
@@ -4,7 +4,6 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libsvg cairo"
 DESCRIPTION = "SVG rendering library"
 DEFAULT_PREFERENCE = "1"
diff --git a/packages/cairo/libsvg_cvs.bb b/packages/cairo/libsvg_cvs.bb
index f2bae3e016..2f4bd8aaad 100644
--- a/packages/cairo/libsvg_cvs.bb
+++ b/packages/cairo/libsvg_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "expat jpeg zlib libpng"
 DESCRIPTION = "SVG parser library"
 LICENSE = "LGPL"
diff --git a/packages/came/came_1.7.bb b/packages/came/came_1.7.bb
index 9c90de47c7..7e01d72583 100644
--- a/packages/came/came_1.7.bb
+++ b/packages/came/came_1.7.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "camE is a rewrite of the xawtv webcam app, which adds imlib2 \
 support and additional features."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "curl giblib"
 SECTION = "x11/utils"
 LICENSE = "GPLv2"
diff --git a/packages/camsource/camsource_0.7.0.bb b/packages/camsource/camsource_0.7.0.bb
index fa9994974d..43930d8caa 100644
--- a/packages/camsource/camsource_0.7.0.bb
+++ b/packages/camsource/camsource_0.7.0.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "camsource grabs images from a video4linux device and makes them \
 available to various plugins for processing or handling."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "jpeg libxml2"
diff --git a/packages/cccc/cccc_3.pre84.bb b/packages/cccc/cccc_3.pre84.bb
index 4bf1bf4231..981de69006 100644
--- a/packages/cccc/cccc_3.pre84.bb
+++ b/packages/cccc/cccc_3.pre84.bb
@@ -5,7 +5,6 @@ DEPENDS += "antlr-native"
 
 DESCRIPTION = "C and C++ Code Counter, a software metrics tool"
 LICENSE = "PD"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "optional"
 SECTION = "devel"
 HOMEPAGE = "http://cccc.sourceforge.net/"
diff --git a/packages/ccdv/ccdv.bb b/packages/ccdv/ccdv.bb
index 05aceabce1..0a3753add5 100644
--- a/packages/ccdv/ccdv.bb
+++ b/packages/ccdv/ccdv.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "ccdv is a tool to reduce the deluge of make output to make \
 finding actual problems easier."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPL"
 SRC_URI = "http://openembedded.org/dl/ccdv.c"
 S = "${WORKDIR}"
diff --git a/packages/cdrtools/cdrtools-native_2.01.bb b/packages/cdrtools/cdrtools-native_2.01.bb
index 9b82fca165..3545093365 100644
--- a/packages/cdrtools/cdrtools-native_2.01.bb
+++ b/packages/cdrtools/cdrtools-native_2.01.bb
@@ -4,7 +4,6 @@
 
 LICENSE="GPL"
 DESCRIPTION="A set of tools for CD recording, including cdrecord"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
 
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2"
diff --git a/packages/cdtool/cdtool_2.1.8pre4.bb b/packages/cdtool/cdtool_2.1.8pre4.bb
index 8f2b425f49..ec51290edf 100644
--- a/packages/cdtool/cdtool_2.1.8pre4.bb
+++ b/packages/cdtool/cdtool_2.1.8pre4.bb
@@ -5,7 +5,6 @@
 HOMEPAGE="http://hinterhof.net/cdtool/"
 DESCRIPTION="cdtool is a free software package to control the audio functions \
 of an attached CDROM drive from the command line in a quick and scriptable way."
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
 
 SRC_URI="http://hinterhof.net/${PN}/dist/${PN}-${PV}.tar.gz \
diff --git a/packages/cfu1/cfu1-modules_2.6.bb b/packages/cfu1/cfu1-modules_2.6.bb
index 07aa7b5c9a..b6446c689b 100644
--- a/packages/cfu1/cfu1-modules_2.6.bb
+++ b/packages/cfu1/cfu1-modules_2.6.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "PCMCIA driver for the RATOC REX-CFU1 USB host controller CF card."
-MAINTAINER = "Botond Botyanszki <openembedded@siliconium.net>"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
 DEPENDS = "virtual/kernel"
diff --git a/packages/changedfiles/changedfiles.inc b/packages/changedfiles/changedfiles.inc
index a47c821182..3a440d0d02 100644
--- a/packages/changedfiles/changedfiles.inc
+++ b/packages/changedfiles/changedfiles.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "A framework for simple filesystem replication \
 and/or security monitoring and/or automatic file transformations"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "fget"
 RDEPENDS = "fget"
diff --git a/packages/check/check_0.9.2.bb b/packages/check/check_0.9.2.bb
index ae704bb8d5..ec7a91d206 100644
--- a/packages/check/check_0.9.2.bb
+++ b/packages/check/check_0.9.2.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "a unit test framework for C"
 LICENSE = "LGPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "optional"
 SECTION = "devel"
 
diff --git a/packages/chillispot/chillispot_0.98.bb b/packages/chillispot/chillispot_0.98.bb
index 662d7eab9c..98b123e394 100644
--- a/packages/chillispot/chillispot_0.98.bb
+++ b/packages/chillispot/chillispot_0.98.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "ChilliSpot is an open source captive portal or wireless LAN access point controller. It is used for authenticating users of a wireless LAN."
 HOMEPAGE = "http://www.chillispot.org/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/chillispot/chillispot_1.0RC3.bb b/packages/chillispot/chillispot_1.0RC3.bb
index 1012f4acbc..b4338a0ba0 100644
--- a/packages/chillispot/chillispot_1.0RC3.bb
+++ b/packages/chillispot/chillispot_1.0RC3.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "ChilliSpot is an open source captive portal or wireless LAN access point controller. It is used for authenticating users of a wireless LAN."
 HOMEPAGE = "http://www.chillispot.org/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 SRC_URI = "http://www.chillispot.org/download/chillispot-${PV}.tar.gz \
 	file://no-ansi.patch;patch=1 \
diff --git a/packages/ckermit/ckermit_211.bb b/packages/ckermit/ckermit_211.bb
index 01835b6d92..c90ea271ae 100644
--- a/packages/ckermit/ckermit_211.bb
+++ b/packages/ckermit/ckermit_211.bb
@@ -4,7 +4,6 @@ cross-platform approach to connection establishment, terminal \
 sessions, file transfer, character-set translation, and automation \
 of communication tasks."
 LICENSE = "Kermit"
-MAINTAINER = "Holger Schurig"
 HOMEPAGE = "http://www.columbia.edu/kermit/"
 SECTION = "console/network"
 SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz"
diff --git a/packages/clamav/clamav_0.88.4.bb b/packages/clamav/clamav_0.88.4.bb
index c53be83094..1395253019 100644
--- a/packages/clamav/clamav_0.88.4.bb
+++ b/packages/clamav/clamav_0.88.4.bb
@@ -9,7 +9,6 @@ DESCRIPTION_${PN}-data = "Static antivirus signature database for Clam AntiVirus
 DESCRIPTION_${PN}-daemon = "An on-demand file scanning service for Clam AntiVirus"
 HOMEPAGE = "http://www.clamav.net/"
 SECTION = "network"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "GPL"
 DEPENDS = "zlib bzip2 gmp"
 RDEPENDS_${PN} = "${PN}-data"
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index c2c9c1281b..cbbab0ad16 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU Classpath standard Java libraries"
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 
 PBN = "classpath"
diff --git a/packages/classpath/classpath_0.14.bb b/packages/classpath/classpath_0.14.bb
index 97a4272201..439d973cc8 100644
--- a/packages/classpath/classpath_0.14.bb
+++ b/packages/classpath/classpath_0.14.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU Classpath standard Java libraries"
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 PR = "r1"
 
diff --git a/packages/classpath/classpath_0.15.bb b/packages/classpath/classpath_0.15.bb
index 97a4272201..439d973cc8 100644
--- a/packages/classpath/classpath_0.15.bb
+++ b/packages/classpath/classpath_0.15.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU Classpath standard Java libraries"
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 PR = "r1"
 
diff --git a/packages/classpath/classpath_0.17.bb b/packages/classpath/classpath_0.17.bb
index f17292a6fb..a28591ac0d 100644
--- a/packages/classpath/classpath_0.17.bb
+++ b/packages/classpath/classpath_0.17.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU Classpath standard Java libraries"
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 PR = "r1"
 
diff --git a/packages/classpath/classpath_0.18.bb b/packages/classpath/classpath_0.18.bb
index e08e69501d..a9a2b2cd2d 100644
--- a/packages/classpath/classpath_0.18.bb
+++ b/packages/classpath/classpath_0.18.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU Classpath standard Java libraries"
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
diff --git a/packages/classpath/classpath_0.19.bb b/packages/classpath/classpath_0.19.bb
index e08e69501d..a9a2b2cd2d 100644
--- a/packages/classpath/classpath_0.19.bb
+++ b/packages/classpath/classpath_0.19.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU Classpath standard Java libraries"
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
diff --git a/packages/classpath/classpath_0.20.bb b/packages/classpath/classpath_0.20.bb
index e08e69501d..a9a2b2cd2d 100644
--- a/packages/classpath/classpath_0.20.bb
+++ b/packages/classpath/classpath_0.20.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU Classpath standard Java libraries"
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
diff --git a/packages/classpath/classpath_cvs.bb b/packages/classpath/classpath_cvs.bb
index 061fa4df90..9e5ac2f000 100644
--- a/packages/classpath/classpath_cvs.bb
+++ b/packages/classpath/classpath_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU Classpath standard Java libraries"
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 PV = "0.20+cvs${SRCDATE}"
 
diff --git a/packages/clearsilver/clearsilver_0.10.3.bb b/packages/clearsilver/clearsilver_0.10.3.bb
index 0e5a86ede2..d39fbdd00c 100644
--- a/packages/clearsilver/clearsilver_0.10.3.bb
+++ b/packages/clearsilver/clearsilver_0.10.3.bb
@@ -3,7 +3,6 @@ SECTION = "net"
 DESCRIPTION = "Clearsilver is a fast, powerful, and language-neutral HTML template system"
 LICENSE = "Neotonic ClearSilver License"
 DEPENDS = "python"
-MAINTAINER = "Cliff Brake <cliff.brake@gmail.com>"
 PR = "r0"
 
 SRC_URI = "http://www.clearsilver.net/downloads/${P}.tar.gz \
diff --git a/packages/cmake/cmake-native_2.2.2.bb b/packages/cmake/cmake-native_2.2.2.bb
index 743316f6dc..fa0b63067d 100644
--- a/packages/cmake/cmake-native_2.2.2.bb
+++ b/packages/cmake/cmake-native_2.2.2.bb
@@ -6,7 +6,6 @@ DESCRIPTION = "A cross-platform, open-source make system"
 HOMEPAGE = "http://www.cmake.org/"
 LICENSE = "Berkely-style license"
 SECTION = "console/utils"
-MAINTAINER = "Eddy Pronk <epronk@muftor.com>"
 
 SRC_URI = "http://www.cmake.org/files/v2.2/cmake-2.2.1.tar.gz"
 
diff --git a/packages/compositeext/compositeext_2.0.bb b/packages/compositeext/compositeext_2.0.bb
index b07deca5be..b9b634d391 100644
--- a/packages/compositeext/compositeext_2.0.bb
+++ b/packages/compositeext/compositeext_2.0.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 LICENSE= "BSD-X"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xextensions fixesext"
 DESCRIPTION = "X Composite extension headers and specification"
 
diff --git a/packages/compositeext/compositeext_cvs.bb b/packages/compositeext/compositeext_cvs.bb
index 94160746e6..8f0f4f9f46 100644
--- a/packages/compositeext/compositeext_cvs.bb
+++ b/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/packages/contacts/contacts_0.1.bb b/packages/contacts/contacts_0.1.bb
index cf025259f2..a7904a6576 100644
--- a/packages/contacts/contacts_0.1.bb
+++ b/packages/contacts/contacts_0.1.bb
@@ -1,7 +1,6 @@
 LICENSE = "LGPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Contacts is an address-book application."
 PR = "r1"
 
diff --git a/packages/contacts/contacts_svn.bb b/packages/contacts/contacts_svn.bb
index cd4f6a7836..bffa1832fd 100644
--- a/packages/contacts/contacts_svn.bb
+++ b/packages/contacts/contacts_svn.bb
@@ -3,7 +3,6 @@ SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus gnome-vfs"
 RDEPENDS = "gnome-vfs-plugin-file"
 RRECOMMENDS = "gnome-vfs-plugin-http"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Contacts is an address-book application."
 PR = "r5"
 
diff --git a/packages/corsair/corsair_0.2.5.bb b/packages/corsair/corsair_0.2.5.bb
index 38d1cef860..d765c51e37 100644
--- a/packages/corsair/corsair_0.2.5.bb
+++ b/packages/corsair/corsair_0.2.5.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "RSS aggregator for Qtopia"
 SECTION = "opie/applications"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Joe Rumsey <joe@rumsey.org>"
 HOMEPAGE = "http://corsair.sf.net/"
diff --git a/packages/cpio/cpio_2.5.bb b/packages/cpio/cpio_2.5.bb
index a625dd7fd5..9762b2e764 100644
--- a/packages/cpio/cpio_2.5.bb
+++ b/packages/cpio/cpio_2.5.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU cpio is a program to manage archives of files."
 HOMEPAGE = "http://www.gnu.org/software/cpio/"
 SECTION = "console"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PR = "r3"
 
 DEPENDS += " texinfo-native "
diff --git a/packages/cppunit/cppunit_1.10.2.bb b/packages/cppunit/cppunit_1.10.2.bb
index 480b869169..def3c9d1f3 100644
--- a/packages/cppunit/cppunit_1.10.2.bb
+++ b/packages/cppunit/cppunit_1.10.2.bb
@@ -6,7 +6,6 @@ DESCRIPTION = "Unit Testing Library for C++"
 HOMEPAGE = "http://cppunit.sourceforge.net/"
 LICENSE = "LGPL"
 SECTION = "devel"
-MAINTAINER = "Eddy Pronk <epronk@muftor.com>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cppunit/cppunit-${PV}.tar.gz"
 
diff --git a/packages/cpuburn/cpuburn_1.4.bb b/packages/cpuburn/cpuburn_1.4.bb
index e2ef9a6c55..9e85b6d6b7 100644
--- a/packages/cpuburn/cpuburn_1.4.bb
+++ b/packages/cpuburn/cpuburn_1.4.bb
@@ -3,7 +3,6 @@
 # Released under the MIT license (see packages/COPYING)
 
 DESCRIPTION="CPU testing utilities in optimized assembler for maximum loading P6, K7, K6, P5 chips"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 HOMEPAGE="http://pages.sbcglobal.net/redelm/"
 LICENSE="GPL"
 
diff --git a/packages/crimsonfields/crimsonfields_0.4.8.bb b/packages/crimsonfields/crimsonfields_0.4.8.bb
index 1a6f52b8f4..102b72fb10 100644
--- a/packages/crimsonfields/crimsonfields_0.4.8.bb
+++ b/packages/crimsonfields/crimsonfields_0.4.8.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Crimson Fields is a tactical war game in the tradition of Battle Isle."
 SECTION = "games"
 DEPENDS = "crimsonfields-native virtual/libsdl libsdl-mixer libsdl-ttf"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/ctags/ctags-native_5.5.4.bb b/packages/ctags/ctags-native_5.5.4.bb
index dd9dd77a22..21b660166c 100644
--- a/packages/ctags/ctags-native_5.5.4.bb
+++ b/packages/ctags/ctags-native_5.5.4.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION="Ctags generates an index (or tag) file of language objects found in source files."
 LICENSE="GPL"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 HOMEPAGE="http://ctags.sourceforge.net/"
 
 SRC_URI="${SOURCEFORGE_MIRROR}/ctags/ctags-${PV}.tar.gz"
diff --git a/packages/ctorrent/ctorrent.inc b/packages/ctorrent/ctorrent.inc
index a6a2f8bc35..9557a2bf33 100644
--- a/packages/ctorrent/ctorrent.inc
+++ b/packages/ctorrent/ctorrent.inc
@@ -4,7 +4,6 @@ http://www.rahul.net/dholmes/ctorrent/ (dnh2 + vfat patch)"
 DEPENDS = "openssl"
 LICENSE = "GPL"
 SECTION = "network"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ctorrent/ctorrent-${PV}.tar.bz2"
 S = "${WORKDIR}/ctorrent-${PV}"
diff --git a/packages/ctrlproxy/ctrlproxy_2.6.2.bb b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
index d426a351ca..4cdbd6bd38 100644
--- a/packages/ctrlproxy/ctrlproxy_2.6.2.bb
+++ b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "ctrlproxy is an IRC server with multiserver support."
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 DEPENDS = "glib-2.0 libxml2 popt libpcre openssl"
 PR = "r1"
 LICENSE = "GPL"
diff --git a/packages/cumulus/cumulus_1.2.1.bb b/packages/cumulus/cumulus_1.2.1.bb
index 1d0d598a6f..28367139eb 100644
--- a/packages/cumulus/cumulus_1.2.1.bb
+++ b/packages/cumulus/cumulus_1.2.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A flightcomputer application for Qt/E based Palmtop Environments"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 APPTYPE = "binary"
 APPNAME = "cumulus"
diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb
index 07ef0ccf1a..a56ad5e15d 100644
--- a/packages/cumulus/cumulus_cvs.bb
+++ b/packages/cumulus/cumulus_cvs.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A flightcomputer application for Qt/E based Palmtop Environments"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 APPTYPE = "binary"
 APPNAME = "cumulus"
diff --git a/packages/cxcrypt/cxcrypt_1.0.bb b/packages/cxcrypt/cxcrypt_1.0.bb
index 16352ee313..280b643c4d 100644
--- a/packages/cxcrypt/cxcrypt_1.0.bb
+++ b/packages/cxcrypt/cxcrypt_1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A simple, xor-based encryption tool"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Martin Dietze <herbert@spamcop.net>"
 PV = 1.0
 LICENSE = LGPL
 
diff --git a/packages/damageext/damageext_1.0.bb b/packages/damageext/damageext_1.0.bb
index bb6ad63adc..3b431a8688 100644
--- a/packages/damageext/damageext_1.0.bb
+++ b/packages/damageext/damageext_1.0.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 LICENSE = "MIT-X"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xextensions fixesext"
 DESCRIPTION = "X Damage extension headers and specification"
 PR = "r1"
diff --git a/packages/damageext/damageext_cvs.bb b/packages/damageext/damageext_cvs.bb
index 86a6032b29..e9ffa7d2b1 100644
--- a/packages/damageext/damageext_cvs.bb
+++ b/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/packages/dates/dates_svn.bb b/packages/dates/dates_svn.bb
index 3d658aae54..ad9e02619e 100644
--- a/packages/dates/dates_svn.bb
+++ b/packages/dates/dates_svn.bb
@@ -1,7 +1,6 @@
 LICENSE = "LGPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Dates is a calendar application."
 
 PR = "r5"
diff --git a/packages/davfs2/davfs2_0.2.7.bb b/packages/davfs2/davfs2_0.2.7.bb
index 509671a229..5ed112087c 100644
--- a/packages/davfs2/davfs2_0.2.7.bb
+++ b/packages/davfs2/davfs2_0.2.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Linux file system driver that allows you to mount a WebDAV server as a disk drive."
 SECTION = "network"
 PRIORITY = "optional"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 HOMEPAGE = "http://dav.sourceforge.net"
 DEPENDS = "neon-0.24.7"
 RDEPENDS_${PN} = "kernel-module-coda"
diff --git a/packages/davfs2/davfs2_0.2.8.bb b/packages/davfs2/davfs2_0.2.8.bb
index a00486f3cc..a95bdde228 100644
--- a/packages/davfs2/davfs2_0.2.8.bb
+++ b/packages/davfs2/davfs2_0.2.8.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Linux file system driver that allows you to mount a WebDAV server as a disk drive."
 SECTION = "network"
 PRIORITY = "optional"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 HOMEPAGE = "http://dav.sourceforge.net"
 DEPENDS = "neon-0.25.5"
 RDEPENDS_${PN} = "kernel-module-coda"
diff --git a/packages/dcetest/dcetest.bb b/packages/dcetest/dcetest.bb
index df99466b4d..e5bfb93d84 100644
--- a/packages/dcetest/dcetest.bb
+++ b/packages/dcetest/dcetest.bb
@@ -1,6 +1,5 @@
 SECTION = "network/misc"
 DESCRIPTION = "DCE Service enumerator for MS Windows systems"
-MAINTAINER = "Bob Davies (tyggerbob@gmail.com)"
 PV = "1.2"
 
 SRC_URI = "http://packetstormsecurity.org/UNIX/scanners/dcetest-2.0.tar.gz"
diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb
index 8a2e8738a7..928b6b6ab3 100644
--- a/packages/dcop/dcopidl-native_3.5.4.bb
+++ b/packages/dcop/dcopidl-native_3.5.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "DCOP IDL parser"
 SECTION     = "kde/dev"
 PRIORITY    = "optional"
-MAINTAINER  = "freyther@kde.org"
 LICENSE     = "GPL"
 DEPENDS     = "uicmoc3-native"
 
diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb
index 5828bc35ec..e520d3f97c 100644
--- a/packages/dcop/dcopidl2cpp-native_3.5.4.bb
+++ b/packages/dcop/dcopidl2cpp-native_3.5.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "DCOP IDL parser"
 SECTION     = "kde/dev"
 PRIORITY    = "optional"
-MAINTAINER  = "freyther@kde.org"
 LICENSE     = "GPL"
 DEPENDS     = "uicmoc3-native"
 
diff --git a/packages/ddclient/ddclient_3.6.3.bb b/packages/ddclient/ddclient_3.6.3.bb
index acaf2c68a9..5a15548bc9 100644
--- a/packages/ddclient/ddclient_3.6.3.bb
+++ b/packages/ddclient/ddclient_3.6.3.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "Ddclient is a Perl client used to update dynamic DNS entries for accounts on Dynamic DNS Network Services"
 HOMEPAGE = "http://ddclient.sourceforge.net/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ddclient/ddclient-${PV}.tar.bz2 \
diff --git a/packages/dejagnu/dejagnu-qemu_1.0.bb b/packages/dejagnu/dejagnu-qemu_1.0.bb
index aed0f207e3..0b93e94a7b 100644
--- a/packages/dejagnu/dejagnu-qemu_1.0.bb
+++ b/packages/dejagnu/dejagnu-qemu_1.0.bb
@@ -1,5 +1,4 @@
 LICENSE = "GPL"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 
 inherit cross
 
diff --git a/packages/detect-stylus/detect-stylus_0.10.bb b/packages/detect-stylus/detect-stylus_0.10.bb
index 00b7209fee..a764f1335f 100644
--- a/packages/detect-stylus/detect-stylus_0.10.bb
+++ b/packages/detect-stylus/detect-stylus_0.10.bb
@@ -8,7 +8,6 @@ RDEPENDS = "xrdb xcursor-transparent-theme"
 SECTION = "gpe"
 
 DESCRIPTION = "Touchscreen detection utility"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
 
diff --git a/packages/detect-stylus/detect-stylus_0.13.bb b/packages/detect-stylus/detect-stylus_0.13.bb
index 2203363b7b..932f1a6d62 100644
--- a/packages/detect-stylus/detect-stylus_0.13.bb
+++ b/packages/detect-stylus/detect-stylus_0.13.bb
@@ -8,7 +8,6 @@ SECTION = "gpe"
 RDEPENDS = "xrdb"
 
 DESCRIPTION = "Touchscreen detection utility"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
            file://access.patch;patch=1;pnum=0 \
diff --git a/packages/device-mapper/device-mapper_1.01.04.bb b/packages/device-mapper/device-mapper_1.01.04.bb
index 64d66b965e..2e1da9feaa 100644
--- a/packages/device-mapper/device-mapper_1.01.04.bb
+++ b/packages/device-mapper/device-mapper_1.01.04.bb
@@ -2,7 +2,6 @@ SECTION = "libs"
 DESCRIPTION = "The Device-mapper is a new component of the linux kernel \
 that supports logical volume management. It is required by LVM2 and EVMS. \
 The original LVM (included in stock 2.4 kernels) does not use it."
-MAINTAINER = "Dan Williams <dan.j.williams@gmail.com>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/device-mapper/device-mapper_1.01.05.bb b/packages/device-mapper/device-mapper_1.01.05.bb
index fc0efb1670..1626f01ee4 100644
--- a/packages/device-mapper/device-mapper_1.01.05.bb
+++ b/packages/device-mapper/device-mapper_1.01.05.bb
@@ -2,7 +2,6 @@ SECTION = "libs"
 DESCRIPTION = "The Device-mapper is a new component of the linux kernel \
 that supports logical volume management. It is required by LVM2 and EVMS. \
 The original LVM (included in stock 2.4 kernels) does not use it."
-MAINTAINER = "Dan Williams <dan.j.williams@gmail.com>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/devio/devio.inc b/packages/devio/devio.inc
index 9d346dc43a..4cba2d5cc0 100644
--- a/packages/devio/devio.inc
+++ b/packages/devio/devio.inc
@@ -1,7 +1,6 @@
 # This package builds the devio program
 DESCRIPTION = "devio - block devio io"
 HOMEPAGE = "http://devio.sourceforge.net/"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "base"
 LICENSE = "MIT"
 
diff --git a/packages/dhcdbd/dhcdbd_1.14.bb b/packages/dhcdbd/dhcdbd_1.14.bb
index 3194942e4e..8c05470f06 100644
--- a/packages/dhcdbd/dhcdbd_1.14.bb
+++ b/packages/dhcdbd/dhcdbd_1.14.bb
@@ -2,7 +2,6 @@ DESCRIPTION="DBus-enabled dhcp client"
 SECTION="net"
 LICENSE="GPL"
 HOMEPAGE="http://people.redhat.com/jvdias/dhcdbd/"
-MAINTAINER="Milan Plzik <mmp@handhelds.org>"
 
 DEPENDS = "dbus"
 
diff --git a/packages/dhcdbd/dhcdbd_1.16.bb b/packages/dhcdbd/dhcdbd_1.16.bb
index 5b72bd91c8..a510c49286 100644
--- a/packages/dhcdbd/dhcdbd_1.16.bb
+++ b/packages/dhcdbd/dhcdbd_1.16.bb
@@ -2,7 +2,6 @@ DESCRIPTION="DBus-enabled dhcp client"
 SECTION="net"
 LICENSE="GPL"
 HOMEPAGE="http://people.redhat.com/jvdias/dhcdbd/"
-MAINTAINER="Milan Plzik <mmp@handhelds.org>"
 
 DEPENDS = "dbus"
 
diff --git a/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb b/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
index 3a15341a83..aefbf882d9 100644
--- a/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
+++ b/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "This program is used to forward DHCP and BOOTP messages between t
  It works better with ppp - and especially with ipsec over ppp - than \
  dhcp-relay from ISC and has a smaller foot print."
 HOMEPAGE = "http://www.nongnu.org/dhcp-fwd/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPLv2"
  
 SRC_URI = "http://savannah.nongnu.org/download/dhcp-fwd/dhcp-forwarder-${PV}.tar.bz2 \
diff --git a/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb b/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb
index 3a15341a83..aefbf882d9 100644
--- a/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb
+++ b/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "This program is used to forward DHCP and BOOTP messages between t
  It works better with ppp - and especially with ipsec over ppp - than \
  dhcp-relay from ISC and has a smaller foot print."
 HOMEPAGE = "http://www.nongnu.org/dhcp-fwd/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPLv2"
  
 SRC_URI = "http://savannah.nongnu.org/download/dhcp-fwd/dhcp-forwarder-${PV}.tar.bz2 \
diff --git a/packages/dhcp/dhcp_3.0.1.bb b/packages/dhcp/dhcp_3.0.1.bb
index 5241fc6f69..1536aea914 100644
--- a/packages/dhcp/dhcp_3.0.1.bb
+++ b/packages/dhcp/dhcp_3.0.1.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "Internet Software Consortium DHCP package"
 HOMEPAGE = "http://www.isc.org/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "BSD"
 PR = "r2"
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
diff --git a/packages/dhcp/dhcp_3.0.2.bb b/packages/dhcp/dhcp_3.0.2.bb
index 5241fc6f69..1536aea914 100644
--- a/packages/dhcp/dhcp_3.0.2.bb
+++ b/packages/dhcp/dhcp_3.0.2.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "Internet Software Consortium DHCP package"
 HOMEPAGE = "http://www.isc.org/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "BSD"
 PR = "r2"
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
diff --git a/packages/dia/dia_0.94+0.95pre3.bb b/packages/dia/dia_0.94+0.95pre3.bb
index 6c7f9acbd6..69b11f131a 100644
--- a/packages/dia/dia_0.94+0.95pre3.bb
+++ b/packages/dia/dia_0.94+0.95pre3.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Dia is a gtk+ based diagram creation program released under the G
 LICENSE = "GPL"
 SECTION = "x11/graphics"
 DEPENDS = "libart-lgpl libpng cairo zlib gtk+ libxml2"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PR = "r2"
 
 inherit autotools pkgconfig
diff --git a/packages/didiwiki/didiwiki.inc b/packages/didiwiki/didiwiki.inc
index 71666f1b36..906420402d 100644
--- a/packages/didiwiki/didiwiki.inc
+++ b/packages/didiwiki/didiwiki.inc
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "A small and simple WikiWikiWeb implementation written in C \
 and which includes a built in webserver."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://didiwiki.org/sources/didiwiki-${PV}.tar.gz"
diff --git a/packages/diffstat/diffstat_1.39.bb b/packages/diffstat/diffstat_1.39.bb
index 02c64ff615..01bada16af 100644
--- a/packages/diffstat/diffstat_1.39.bb
+++ b/packages/diffstat/diffstat_1.39.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "diffstat reads the output of diff and displays a histogram of \
 the insertions, deletions, and modifications per-file. It is useful for \
 reviewing large, complex patch files."
 HOMEPAGE = "http://invisible-island.net/diffstat/"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "optional"
 SECTION = "devel"
 
diff --git a/packages/dillo/dillo2_0.6.6.bb b/packages/dillo/dillo2_0.6.6.bb
index 3416b01505..f6052e860d 100644
--- a/packages/dillo/dillo2_0.6.6.bb
+++ b/packages/dillo/dillo2_0.6.6.bb
@@ -10,7 +10,6 @@ SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.gz \
 	 file://dillo.png \
 	 file://dillorc"
 
-MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 PRIORITY = "optional"
 
 S = "${WORKDIR}/dillo-${PV}/"
diff --git a/packages/dillo/dillo_0.8.5.bb b/packages/dillo/dillo_0.8.5.bb
index caf1323614..eb9e76c3e6 100644
--- a/packages/dillo/dillo_0.8.5.bb
+++ b/packages/dillo/dillo_0.8.5.bb
@@ -10,7 +10,6 @@ SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \
 	 file://dillo.png"
 	 
 
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 PRIORITY = "optional"
 
 RCONFLICTS = "dillo2"
diff --git a/packages/dillo/dillo_0.8.6.bb b/packages/dillo/dillo_0.8.6.bb
index be4a59b034..355d910d3f 100644
--- a/packages/dillo/dillo_0.8.6.bb
+++ b/packages/dillo/dillo_0.8.6.bb
@@ -8,7 +8,6 @@ SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \
 	 file://dillo.png"
 	 
 
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 PRIORITY = "optional"
 
 RCONFLICTS = "dillo2"
diff --git a/packages/directfb/++dfb_0.9.23.bb b/packages/directfb/++dfb_0.9.23.bb
index 4c1f6bc482..0f965af118 100644
--- a/packages/directfb/++dfb_0.9.23.bb
+++ b/packages/directfb/++dfb_0.9.23.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library."
 HOMEPAGE = "http://directfb.org"
 SECTION = "libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "directfb"
 LICENSE = "LGPL"
 
diff --git a/packages/directfb/directfb-examples_0.9.23.bb b/packages/directfb/directfb-examples_0.9.23.bb
index 5357b55b6d..423e888fd8 100644
--- a/packages/directfb/directfb-examples_0.9.23.bb
+++ b/packages/directfb/directfb-examples_0.9.23.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "DirectFB examples"
 DEPENDS = "directfb"
 SECTION = "devel/examples"
 LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de"
 
 SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz"
 S = "${WORKDIR}/DirectFB-examples-${PV}"
diff --git a/packages/directfb/directfb_0.9.25.1.bb b/packages/directfb/directfb_0.9.25.1.bb
index 76e849d14b..09fddd4c7c 100644
--- a/packages/directfb/directfb_0.9.25.1.bb
+++ b/packages/directfb/directfb_0.9.25.1.bb
@@ -6,7 +6,6 @@ Linux framebuffer device."
 SECTION = "libs"
 LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "jpeg libpng freetype zlib"
 PR = "r1"
 RV = "0.9.25"
diff --git a/packages/display-brightness/display-brightness_1.0.0.bb b/packages/display-brightness/display-brightness_1.0.0.bb
index 87725cfa39..aa3c0995e9 100644
--- a/packages/display-brightness/display-brightness_1.0.0.bb
+++ b/packages/display-brightness/display-brightness_1.0.0.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "display brightness utility"
 AUTHOR = "Patrick Steiner <patrick.steiner@a1.net>"
-MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 DEPENDS = ""
 PRIORITY = "optional"
 PR = "r2"
diff --git a/packages/dnsmasq/dnsmasq.inc b/packages/dnsmasq/dnsmasq.inc
index 389f67cbb2..a2ad55f647 100644
--- a/packages/dnsmasq/dnsmasq.inc
+++ b/packages/dnsmasq/dnsmasq.inc
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION = "Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server."
 HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${PV}.tar.gz \
            file://init \
diff --git a/packages/dosfstools/dosfstools_2.10.bb b/packages/dosfstools/dosfstools_2.10.bb
index ec06ae94fc..100044b75d 100644
--- a/packages/dosfstools/dosfstools_2.10.bb
+++ b/packages/dosfstools/dosfstools_2.10.bb
@@ -3,7 +3,6 @@
 # Released under the MIT license (see packages/COPYING)
 
 DESCRIPTION = "DOS FAT Filesystem Utilities"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 
 SECTION = "base"
 PRIORITY = "optional"
diff --git a/packages/dosfstools/dosfstools_2.11.bb b/packages/dosfstools/dosfstools_2.11.bb
index c7398708e4..a5f6e034dd 100644
--- a/packages/dosfstools/dosfstools_2.11.bb
+++ b/packages/dosfstools/dosfstools_2.11.bb
@@ -3,7 +3,6 @@
 # Released under the MIT license (see packages/COPYING)
 
 DESCRIPTION = "DOS FAT Filesystem Utilities"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 
 SECTION = "base"
 PRIORITY = "optional"
diff --git a/packages/dpkg/dpkg.inc b/packages/dpkg/dpkg.inc
index 349f31a7b6..fb82fa420a 100644
--- a/packages/dpkg/dpkg.inc
+++ b/packages/dpkg/dpkg.inc
@@ -4,7 +4,6 @@ SECTION = "base"
 DEPENDS = "ncurses zlib"
 DEPENDS_${PN} += "update-alternatives"
 
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
 S = "${WORKDIR}/dpkg-${PV}"
diff --git a/packages/driftnet/driftnet-nogui_0.1.6.bb b/packages/driftnet/driftnet-nogui_0.1.6.bb
index f17d5b99ce..4dac21524f 100644
--- a/packages/driftnet/driftnet-nogui_0.1.6.bb
+++ b/packages/driftnet/driftnet-nogui_0.1.6.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Driftnet watches network traffic, and picks out and displays JPEG
 images for display. It is an horrific invasion of privacy and shouldn't be used \
 by anyone anywhere. It can also extract MPEG audio data from the network and \
 play it."
-MAINTAINER = "Simon Pickering <S.G.Pickering@bath.ac.uk>"
 SECTION = "net"
 PRIORITY = "optional"
 
diff --git a/packages/driftnet/driftnet_0.1.6.bb b/packages/driftnet/driftnet_0.1.6.bb
index e7bc661245..8a272792a0 100644
--- a/packages/driftnet/driftnet_0.1.6.bb
+++ b/packages/driftnet/driftnet_0.1.6.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Driftnet watches network traffic, and picks out and displays JPEG
 images for display. It is an horrific invasion of privacy and shouldn't be used \
 by anyone anywhere. It can also extract MPEG audio data from the network and \
 play it."
-MAINTAINER = "Simon Pickering <S.G.Pickering@bath.ac.uk>"
 SECTION = "net"
 PRIORITY = "optional"
 
diff --git a/packages/dvbtools/dvbstream_cvs.bb b/packages/dvbtools/dvbstream_cvs.bb
index 0a468669a8..3a9a806264 100644
--- a/packages/dvbtools/dvbstream_cvs.bb
+++ b/packages/dvbtools/dvbstream_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 SECTION = "console/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPLV2"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libxml2"
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/dvbtools;module=dvbstream"
 S = "${WORKDIR}/dvbstream"
diff --git a/packages/dvbtools/dvbtraffic.bb b/packages/dvbtools/dvbtraffic.bb
index 14dd0af97d..b41364353d 100644
--- a/packages/dvbtools/dvbtraffic.bb
+++ b/packages/dvbtools/dvbtraffic.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "dvbtraffic is a tool to display all pids on a transport stream"
 SECTION = "console/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
-MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 PV = "0.0cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@cvs.linuxtv.org/cvs/linuxtv;module=dvb-apps/util/dvbtraffic"
diff --git a/packages/dvbtools/dvbtune_cvs.bb b/packages/dvbtools/dvbtune_cvs.bb
index c770aa1305..d2e6296735 100644
--- a/packages/dvbtools/dvbtune_cvs.bb
+++ b/packages/dvbtools/dvbtune_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 SECTION = "console/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libxml2"
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/dvbtools;module=dvbtune"
 S = "${WORKDIR}/dvbtune"
diff --git a/packages/dvbtools/sctzap_cvs.bb b/packages/dvbtools/sctzap_cvs.bb
index e2900e873d..294b3b4ac1 100644
--- a/packages/dvbtools/sctzap_cvs.bb
+++ b/packages/dvbtools/sctzap_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "szap, czap, tzap are command-line based tools to tune in a DVB se
 SECTION = "console/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
-MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 PV = "0.0cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@cvs.linuxtv.org/cvs/linuxtv;module=dvb-apps/util/szap \
diff --git a/packages/e17/e17-gpe-menu-convert_0.2.bb b/packages/e17/e17-gpe-menu-convert_0.2.bb
index 1b3181fb95..5ec40cd761 100644
--- a/packages/e17/e17-gpe-menu-convert_0.2.bb
+++ b/packages/e17/e17-gpe-menu-convert_0.2.bb
@@ -3,7 +3,6 @@ DEPENDS = "edje-utils e-wm"
 RDEPENDS += "edje-utils e-wm"
 LICENSE = "MIT"
 SECTION = "e/apps"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r4"
 
 #this is a shell script
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb
index 883b408634..90ed15e3f0 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = ""
 FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
 
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb
index 79fc6f2185..4d4a432b22 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = ""
 FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
 
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb
index f3bd69fa1c..9809ac5a6e 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
diff --git a/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb b/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb
index a9576b6860..875dafdc4a 100644
--- a/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb
+++ b/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb
@@ -1,7 +1,6 @@
 DESCRIPTION="EXT2 Filesystem Utilities"
 SECTION="base"
 PRIORITY="optional"
-MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
 DEPENDS=virtual/libc 
 
diff --git a/packages/e2fsprogs/e2fsprogs_1.33.bb b/packages/e2fsprogs/e2fsprogs_1.33.bb
index d13ab8868e..63732aac4b 100644
--- a/packages/e2fsprogs/e2fsprogs_1.33.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.33.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
 SECTION = "base"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = ""
 PR = "r1"
 
diff --git a/packages/e2fsprogs/e2fsprogs_1.34.bb b/packages/e2fsprogs/e2fsprogs_1.34.bb
index 20cf9b8b11..9171d39c6b 100644
--- a/packages/e2fsprogs/e2fsprogs_1.34.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.34.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
diff --git a/packages/e2fsprogs/e2fsprogs_1.35.bb b/packages/e2fsprogs/e2fsprogs_1.35.bb
index 20cf9b8b11..9171d39c6b 100644
--- a/packages/e2fsprogs/e2fsprogs_1.35.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.35.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
diff --git a/packages/e2tools/e2tools_0.0.16.bb b/packages/e2tools/e2tools_0.0.16.bb
index 51c0331aa3..7f98bdb6d3 100644
--- a/packages/e2tools/e2tools_0.0.16.bb
+++ b/packages/e2tools/e2tools_0.0.16.bb
@@ -2,7 +2,6 @@ SECTION = "base"
 LICENSE = "GPL"
 DESCRIPTION = "A simple set of utilities for reading, writing, and \
 manipulating files in an ext2/ext3 filesystem."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "e2fsprogs-libs e2fsprogs"
 SRC_URI = "http://www.pobox.com/~sheff/sw/e2tools/e2tools-${PV}.tar.gz \
 	   file://autofoo.patch;patch=1"
diff --git a/packages/ebtables/ebtables_2.0.6.bb b/packages/ebtables/ebtables_2.0.6.bb
index 318dd664a1..33ad2b9113 100644
--- a/packages/ebtables/ebtables_2.0.6.bb
+++ b/packages/ebtables/ebtables_2.0.6.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
 PRIORITY = "optional"
-MAINTAINER = "Ned Ludd <solar@gentoo.org>"
 LICENSE = "GPL"
 SECTION = "console/network"
 PR = "r2"
diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb
index 59405b43be..c39d5b7443 100644
--- a/packages/eds/eds-dbus_svn.bb
+++ b/packages/eds/eds-dbus_svn.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Evolution database backend server"
 HOMEPAGE = "http://projects.o-hand.com/eds"
 LICENSE = "LGPL"
-MAINTAINER = "Richard Purdie <richard@openedhand.com>"
 DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib"
 
 PV = "1.4.0+svn${SRCDATE}"
diff --git a/packages/efl++/efl++.inc b/packages/efl++/efl++.inc
index 4eba64bd12..52cea6e2aa 100644
--- a/packages/efl++/efl++.inc
+++ b/packages/efl++/efl++.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "C++ Bindings for the Enlightenment Foundation Libraries"
 SECTION = "e/libs"
 LICENSE = "LGPL"
 AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-MAINTAINER = "${AUTHOR}"
 HOMEPAGE = "http://www.Vanille.de/projects/efl++.html"
 DEPENDS = "virtual/evas virtual/ecore etk edje libsigc++-2.0"
 PROVIDES = "virtual/efl++"
diff --git a/packages/ekg/ekg_1.5.bb b/packages/ekg/ekg_1.5.bb
index 28ba8ba6be..d46f600396 100644
--- a/packages/ekg/ekg_1.5.bb
+++ b/packages/ekg/ekg_1.5.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "gadu-gadu protocol instant messaging client"
 DESCRIPTION_libgadu = "gadu-gadu protocol instant messaging libs"
-MAINTAINER = "Maciej Swiniarski <luzik@gda.pl>"
 LICENSE = "GPL"
 HOMEPAGE = "http://dev.null.pl/ekg/"
 SECTION = "console/network"
diff --git a/packages/elfkickers/elfkickers_2.0a.bb b/packages/elfkickers/elfkickers_2.0a.bb
index d5b771cbf9..6f18da5960 100644
--- a/packages/elfkickers/elfkickers_2.0a.bb
+++ b/packages/elfkickers/elfkickers_2.0a.bb
@@ -1,6 +1,5 @@
 HOMEPAGE = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "optional"
 SECTION = "devel"
 
diff --git a/packages/elitaire/elitaire_0.0.5.bb b/packages/elitaire/elitaire_0.0.5.bb
index ac3aebebbf..b33e9fa014 100644
--- a/packages/elitaire/elitaire_0.0.5.bb
+++ b/packages/elitaire/elitaire_0.0.5.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "EFL-based solitaire"
 DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 ewl"
 LICENSE = "MIT"
 SECTION = "e/apps"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r0"
 
 SRC_URI = "http://www.mowem.de/elitaire/elitaire-${PV}.tar.bz2 \
diff --git a/packages/elvis/elvis_2.2.0.bb b/packages/elvis/elvis_2.2.0.bb
index cd460c3400..3f1ff12e65 100644
--- a/packages/elvis/elvis_2.2.0.bb
+++ b/packages/elvis/elvis_2.2.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A vi clone"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Martin Dietze <herbert@spamcop.net>"
 LICENSE = "Perl Clarified Artistic License"
 DEPENDS = "ncurses"
 
diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb
index 4e7255e61c..ef58dfa5b6 100644
--- a/packages/emacs/emacs_cvs.bb
+++ b/packages/emacs/emacs_cvs.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Emacs"
 HOMEPAGE = "http://www.gnu.org/software/emacs/"
 LICENSE = "GPLv2"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "editor"
 # and it needs to run some generated binaries..
 DEPENDS += "qemu-native"
diff --git a/packages/emelfm2/emelfm2_0.0.8.bb b/packages/emelfm2/emelfm2_0.0.8.bb
index 6d9b50f991..092488d5ea 100644
--- a/packages/emelfm2/emelfm2_0.0.8.bb
+++ b/packages/emelfm2/emelfm2_0.0.8.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION="emelFM2 is a GTK2+ file manager that implements the popular \
 	two-pane design."
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 HOMEPAGE="http://dasui.prima.de/e2wiki/"
 SRC_URI="http://dasui.prima.de/~tooar/emelfm2-${PV}.tar.gz \
 	file://makefile.patch;patch=1"
diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb
index a335b17eb6..48e33e376e 100644
--- a/packages/enca/enca_1.9.bb
+++ b/packages/enca/enca_1.9.bb
@@ -3,7 +3,6 @@ LICENSE = "GPL2"
 SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://trific.ath.cx/software/enca/"
-MAINTAINER = "John Bloom <johnxx@gmail.com>"
 PR = "r1"
 
 SRC_URI = "http://trific.ath.cx/Ftp//enca/enca-${PV}.tar.bz2 \
diff --git a/packages/enchant/enchant_1.1.3.bb b/packages/enchant/enchant_1.1.3.bb
index 085427b5a0..a1e70852b0 100644
--- a/packages/enchant/enchant_1.1.3.bb
+++ b/packages/enchant/enchant_1.1.3.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Enchant Spell checker API Library"
-MAINTAINER  = "AbiWord Team"
 PRIORITY    = "optional"
 SECTION     = "libs"
 
diff --git a/packages/enchant/enchant_1.2.5.bb b/packages/enchant/enchant_1.2.5.bb
index d727a9ccf5..5045a762b0 100644
--- a/packages/enchant/enchant_1.2.5.bb
+++ b/packages/enchant/enchant_1.2.5.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Enchant Spell checker API Library"
-MAINTAINER  = "AbiWord Team"
 PRIORITY    = "optional"
 SECTION     = "libs"
 LICENSE     = "LGPL"
diff --git a/packages/enscript/enscript_1.6.4.bb b/packages/enscript/enscript_1.6.4.bb
index 185528fff7..0818c8f436 100644
--- a/packages/enscript/enscript_1.6.4.bb
+++ b/packages/enscript/enscript_1.6.4.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "GNU enscript is a drop-in replacement for the enscript program. \
 Enscript converts ASCII files to PostScript and stores generated \
 output to a file or sends it directly to the printer."
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/e/enscript/enscript_${PV}.orig.tar.gz \
 	   file://autotools.patch;patch=1"
diff --git a/packages/epdfview/epdfview_0.1.2.bb b/packages/epdfview/epdfview_0.1.2.bb
index bdc8b7f8c6..397bef6fe8 100644
--- a/packages/epdfview/epdfview_0.1.2.bb
+++ b/packages/epdfview/epdfview_0.1.2.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
diff --git a/packages/epdfview/epdfview_0.1.3.bb b/packages/epdfview/epdfview_0.1.3.bb
index 3ff6db7397..94bc3a51ab 100644
--- a/packages/epdfview/epdfview_0.1.3.bb
+++ b/packages/epdfview/epdfview_0.1.3.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
diff --git a/packages/epdfview/epdfview_0.1.4.bb b/packages/epdfview/epdfview_0.1.4.bb
index 3ff6db7397..94bc3a51ab 100644
--- a/packages/epdfview/epdfview_0.1.4.bb
+++ b/packages/epdfview/epdfview_0.1.4.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
diff --git a/packages/epdfview/epdfview_0.1.5.bb b/packages/epdfview/epdfview_0.1.5.bb
index 6c9d83f4f0..14966601c2 100644
--- a/packages/epdfview/epdfview_0.1.5.bb
+++ b/packages/epdfview/epdfview_0.1.5.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
diff --git a/packages/erlang/erlang.inc b/packages/erlang/erlang.inc
index e9204a9d3b..e6c7766dff 100644
--- a/packages/erlang/erlang.inc
+++ b/packages/erlang/erlang.inc
@@ -3,7 +3,6 @@ with built-in support for concurrency, distribution and fault tolerance"
 SECTION = "devel/erlang"
 DEPENDS = "ncurses"
 PRIORITY = "optional"
-MAINTAINER = "Brian Zhou <bzhou@nslu2-linux.org>"
 LICENSE = "ERLANG PUBLIC LICENSE"
 
 UPSTREAM_VERSION = "${@bb.data.getVar('PV', d, 1).replace('.', '-')}"
diff --git a/packages/ethereal/ethereal_0.99.0.bb b/packages/ethereal/ethereal_0.99.0.bb
index 1c46e432d5..a6748be077 100644
--- a/packages/ethereal/ethereal_0.99.0.bb
+++ b/packages/ethereal/ethereal_0.99.0.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.ethereal.com"
 SECTION = "x11/network"
 LICENSE = "GPL"
 DEPENDS = "perl-native gtk+ gnutls libpcap"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ethereal/ethereal-${PV}.tar.bz2 \
diff --git a/packages/eventlog/eventlog_0.2.5.bb b/packages/eventlog/eventlog_0.2.5.bb
index bf8beef391..39766cc834 100644
--- a/packages/eventlog/eventlog_0.2.5.bb
+++ b/packages/eventlog/eventlog_0.2.5.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Replacement syslog API"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "BSD"
 PR = "r0"
 
diff --git a/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb b/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb
index 62cd506d9f..2b9c578125 100644
--- a/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb
+++ b/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb
@@ -1,7 +1,6 @@
 # Angus Mackay's ez-ipupdate from www.ez-ipupdate.com
 DESCRIPTION = "A client for automatically updating your EZ-IP.net, justlinux.com, dhs.org, dyndns.org, ods.org, gnudip.cheapnet.net, tzo.com, easydns.com dynamic hostname parameters. Includes daemon support that only sends updates if your IP address changes."
 HOMEPAGE = "http://www.ez-ipupdate.com/"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/ezx/ezx-boot-usb-native_1877.bb b/packages/ezx/ezx-boot-usb-native_1877.bb
index d908c6d1fc..5fe3294fee 100644
--- a/packages/ezx/ezx-boot-usb-native_1877.bb
+++ b/packages/ezx/ezx-boot-usb-native_1877.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Boots an EZX device with a user supplied kernel zImage"
 DEPENDS = "libusb-native"
 SECTION = "devel"
 AUTHOR = "Harald Welte"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/ezx/ezx-gpiotool_1877.bb b/packages/ezx/ezx-gpiotool_1877.bb
index 68f5d0d4f4..81a1ecc2a0 100644
--- a/packages/ezx/ezx-gpiotool_1877.bb
+++ b/packages/ezx/ezx-gpiotool_1877.bb
@@ -3,7 +3,6 @@ SECTION = "devel"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.openezx.org"
 AUTHOR = "Harald Welte"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 
 SRC_URI = "svn://svn.openezx.org/trunk/src/userspace;module=gpiotool;proto=http;rev=${PV}"
diff --git a/packages/fakeconnect/fakeconnect_1.2.1.bb b/packages/fakeconnect/fakeconnect_1.2.1.bb
index 1dd6f91c95..4af31faee9 100644
--- a/packages/fakeconnect/fakeconnect_1.2.1.bb
+++ b/packages/fakeconnect/fakeconnect_1.2.1.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "FakeConnect is a application/network stress-test program."
 LICENSE = "BSD"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 SRC_URI = "http://www.hostname.org/fake_connect/fakeconnect-${PV}.tar.gz"
 S = "${WORKDIR}/fakeconnect-${PV}"
diff --git a/packages/familiar/familiar-version.bb b/packages/familiar/familiar-version.bb
index 20d94dbf1c..35e302a9de 100644
--- a/packages/familiar/familiar-version.bb
+++ b/packages/familiar/familiar-version.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = ${DISTRO_VERSION}
 
 do_compile() {
diff --git a/packages/farsight/farsight_0.1.5.bb b/packages/farsight/farsight_0.1.5.bb
index ee176dcacd..474eed9c9c 100644
--- a/packages/farsight/farsight_0.1.5.bb
+++ b/packages/farsight/farsight_0.1.5.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "FarSight is an audio/video conferencing framework specifically de
 HOMEPAGE = "http://farsight.sf.net"
 SRC_URI = "http://telepathy.freedesktop.org/releases/farsight/${P}.tar.gz"
 
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 DEPENDS = "glib-2.0 libxml2 zlib dbus libjingle gstreamer gst-plugins-base"
 
diff --git a/packages/farsight/gst-plugins-farsight_0.10.1.bb b/packages/farsight/gst-plugins-farsight_0.10.1.bb
index 5fb44e07c2..09268b33a7 100644
--- a/packages/farsight/gst-plugins-farsight_0.10.1.bb
+++ b/packages/farsight/gst-plugins-farsight_0.10.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "FarSight is an audio/video conferencing framework specifically de
 HOMEPAGE = "http://farsight.sf.net"
 SRC_URI = "http://telepathy.freedesktop.org/releases/gst-plugins-farsight/${P}.tar.gz"
 
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 DEPENDS = "glib-2.0 libxml2 zlib dbus libjingle gstreamer gst-plugins-base"
 
diff --git a/packages/fastjar/fastjar-native_0.92+gcc3.4.2.bb b/packages/fastjar/fastjar-native_0.92+gcc3.4.2.bb
index 31e084ada1..367912fa8b 100644
--- a/packages/fastjar/fastjar-native_0.92+gcc3.4.2.bb
+++ b/packages/fastjar/fastjar-native_0.92+gcc3.4.2.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://sourceforge.net/projects/fastjar/"
 SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 
 DEPENDS = "zlib"
 
diff --git a/packages/fbpanel/fbpanel_4.3.bb b/packages/fbpanel/fbpanel_4.3.bb
index 3b959078ba..09abb86dc8 100644
--- a/packages/fbpanel/fbpanel_4.3.bb
+++ b/packages/fbpanel/fbpanel_4.3.bb
@@ -3,7 +3,6 @@ SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS = "gtk+ libxmu libxpm"
 HOMEPAGE = "http://fbpanel.sourceforge.net/"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 SRC_URI = "${SOURCEFORGE_MIRROR}/fbpanel/fbpanel-${PV}.tgz \
            file://makefile.common.patch;patch=1 "
 
diff --git a/packages/fbreader/fbreader_0.7.3b.bb b/packages/fbreader/fbreader_0.7.3b.bb
index fded05925d..9e7d546780 100644
--- a/packages/fbreader/fbreader_0.7.3b.bb
+++ b/packages/fbreader/fbreader_0.7.3b.bb
@@ -4,7 +4,6 @@ HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
 DEPENDS = "gtk+ enca expat"
-MAINTAINER = "John Bloom <johnxx@gmail.com>"
 
 SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \
 	file://hack-makefile.patch;patch=1 \
diff --git a/packages/fbreader/fbreader_0.7.3d.bb b/packages/fbreader/fbreader_0.7.3d.bb
index 2edfb0e7e8..078932e2c4 100644
--- a/packages/fbreader/fbreader_0.7.3d.bb
+++ b/packages/fbreader/fbreader_0.7.3d.bb
@@ -4,7 +4,6 @@ HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
 DEPENDS = "gtk+ enca expat"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 SRC_URI = "http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-${PV}.tgz \
 	file://fbreader-0.7.3d_buildsys_oe.patch;patch=1"
diff --git a/packages/fbset/fbset_2.1.bb b/packages/fbset/fbset_2.1.bb
index 6b6f1fca42..c03096102b 100644
--- a/packages/fbset/fbset_2.1.bb
+++ b/packages/fbset/fbset_2.1.bb
@@ -6,7 +6,6 @@
 # Date: 28-May-06
 
 DESCRIPTION = "The fbset console tool"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = ""
 LICENSE = "GPL"
 
diff --git a/packages/fbui/fbui-utils_0.9.14c.bb b/packages/fbui/fbui-utils_0.9.14c.bb
index 598686151e..32029b2f46 100644
--- a/packages/fbui/fbui-utils_0.9.14c.bb
+++ b/packages/fbui/fbui-utils_0.9.14c.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Userland utilities for the FBUI in kernel GUI"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SECTION = "base"
 
diff --git a/packages/fdclock/fdclock_cvs.bb b/packages/fdclock/fdclock_cvs.bb
index 8684a8fe73..61d9a018cd 100644
--- a/packages/fdclock/fdclock_cvs.bb
+++ b/packages/fdclock/fdclock_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "x11"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "cairo"
 DESCRIPTION = "The freedesktop.org clock"
 
diff --git a/packages/feh/feh_1.2.6.bb b/packages/feh/feh_1.2.6.bb
index 2cdf8d53c4..1e0f0e4684 100644
--- a/packages/feh/feh_1.2.6.bb
+++ b/packages/feh/feh_1.2.6.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/utils"
 DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "MIT"
 DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt"
 
diff --git a/packages/feh/feh_1.2.7.bb b/packages/feh/feh_1.2.7.bb
index 2cdf8d53c4..1e0f0e4684 100644
--- a/packages/feh/feh_1.2.7.bb
+++ b/packages/feh/feh_1.2.7.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/utils"
 DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "MIT"
 DEPENDS = "virtual/imlib2 giblib jpeg virtual/libx11 libxext libxt"
 
diff --git a/packages/figment/figment_0.3.5.bb b/packages/figment/figment_0.3.5.bb
index 4921287cdd..03d07a1b8a 100644
--- a/packages/figment/figment_0.3.5.bb
+++ b/packages/figment/figment_0.3.5.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/utils"
 DESCRIPTION = "gtk2 outliner written by Matthew Allum"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPLv2"
 DEPENDS = "gtk+ libxml2"
 PR = "r1"
diff --git a/packages/fixesext/fixesext_2.0.1.bb b/packages/fixesext/fixesext_2.0.1.bb
index 02aa4ec625..feb53d60eb 100644
--- a/packages/fixesext/fixesext_2.0.1.bb
+++ b/packages/fixesext/fixesext_2.0.1.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 LICENSE= "BSD-X"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xextensions"
 DESCRIPTION = "X Fixes extension headers and specification."
 
diff --git a/packages/fixesext/fixesext_cvs.bb b/packages/fixesext/fixesext_cvs.bb
index 30b9460138..4ddbc96c64 100644
--- a/packages/fixesext/fixesext_cvs.bb
+++ b/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/packages/flac/flac_1.1.0.bb b/packages/flac/flac_1.1.0.bb
index f1cf8a6fb8..7ac88061b5 100644
--- a/packages/flac/flac_1.1.0.bb
+++ b/packages/flac/flac_1.1.0.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/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb
index ec9d1b7197..cbfaaa0ff5 100644
--- a/packages/flac/flac_1.1.2.bb
+++ b/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/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb b/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
index eb3784d104..1b7a55f03b 100644
--- a/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
+++ b/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Qtopia/Opie Input Method plugin for the Flexis FX100 Keyboard."
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb
index c9a3e71e92..42051d5014 100644
--- a/packages/flite/flite_1.2.bb
+++ b/packages/flite/flite_1.2.bb
@@ -3,7 +3,6 @@ PRIORITY = "optional"
 HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/"
 SECTION = "console/utils"
 LICENSE = "flite"
-MAINTAINER = "Patrick Ohly <Patrick.Ohly@gmx.de>"
 PR = "r2"
 
 PARALLEL_MAKE = ""
diff --git a/packages/fltk/fltk_1.2+cvs20040806.bb b/packages/fltk/fltk_1.2+cvs20040806.bb
index 439c2e7398..a0a9cc565a 100644
--- a/packages/fltk/fltk_1.2+cvs20040806.bb
+++ b/packages/fltk/fltk_1.2+cvs20040806.bb
@@ -3,7 +3,6 @@ LICENSE ="LGPL"
 HOMEPAGE = "http://www.fltk.org"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 DEPENDS = "jpeg libpng zlib"
 PR = "r2"
 
diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
index 5b6caf8d19..81d2952e23 100644
--- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb
+++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
@@ -6,7 +6,6 @@
 # Date: 01-Jul-06
 
 DESCRIPTION = "The Fluxbox WindowManager"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://fluxbox.sourceforge.net"
 LICENSE = "MIT"
 REALPV = "1.0rc"
diff --git a/packages/freeciv/freeciv_2.0.8.bb b/packages/freeciv/freeciv_2.0.8.bb
index 40751edf20..bba9976c63 100644
--- a/packages/freeciv/freeciv_2.0.8.bb
+++ b/packages/freeciv/freeciv_2.0.8.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Freeciv is a free turn-based multiplayer strategy game, in which each player becomes the leader of a civilization, fighting to obtain the ultimate goal: To become the greatest civilization."
 SECTION = "x11/games"
 LICENSE = "GPL"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "gtk+ cairo esound zlib readline"
 PR = "r2"
 
diff --git a/packages/freedoom/freedoom_0.3.bb b/packages/freedoom/freedoom_0.3.bb
index eba40da2ce..0bdc05def8 100644
--- a/packages/freedoom/freedoom_0.3.bb
+++ b/packages/freedoom/freedoom_0.3.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "The Freedoom project aims at collaboratively creating a Free IWAD
 	       based on the Doom engine which is Free Software."
 HOMEPAGE = "http://freedoom.sourceforge.net/"
 PRIORITY = "optional"
-MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 
 SRC_URI = "http://ovh.dl.sourceforge.net/sourceforge/freedoom/freedoom-iwad-0.3.zip"
diff --git a/packages/freedroid/freedroid_1.0.2.bb b/packages/freedroid/freedroid_1.0.2.bb
index f246bf633b..cd148bc2d4 100644
--- a/packages/freedroid/freedroid_1.0.2.bb
+++ b/packages/freedroid/freedroid_1.0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Clone of the classic Paradroid from C64 - SDL version."
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://freedroid.sourceforge.net/"
 PR = "r2"
diff --git a/packages/freeze/freeze.bb b/packages/freeze/freeze.bb
index 5311f7a720..df59c3a948 100644
--- a/packages/freeze/freeze.bb
+++ b/packages/freeze/freeze.bb
@@ -13,7 +13,6 @@
 # as appropriate, directory is the sub-directory of 'packages'.
 #
 DESCRIPTION = "Freeze the bitbake files in the build"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "console/networking"
 PRIORITY = "optional"
 LICENSE = "MIT"
diff --git a/packages/freeze/unfreeze.bb b/packages/freeze/unfreeze.bb
index 73c15ce70f..9d1bb290df 100644
--- a/packages/freeze/unfreeze.bb
+++ b/packages/freeze/unfreeze.bb
@@ -2,7 +2,6 @@
 # configuration fails empty (they just contain a comment).
 #
 DESCRIPTION = "Unfreeze the bitbake files in the build"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "console/networking"
 PRIORITY = "optional"
 LICENSE = "MIT"
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb
index 2e63347f18..fab729b209 100755
--- a/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb
@@ -2,7 +2,6 @@
 PR = "r0"
 DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR"
 HOMEPAGE = "http://sourceforge.net/projects/puppy"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 SECTION = "net"
 LICENSE = "MIT"
 
diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb
index 0b887ba4bc..4d582107bb 100644
--- a/packages/fuse/fuse-module_2.5.3.bb
+++ b/packages/fuse/fuse-module_2.5.3.bb
@@ -1,6 +1,5 @@
 HOMEPAGE = "http://fuse.sf.net"
 DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE = "GPL"
 
diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb
index 2f893d5192..b423e962ae 100644
--- a/packages/fuse/fuse_2.5.3.bb
+++ b/packages/fuse/fuse_2.5.3.bb
@@ -1,6 +1,5 @@
 HOMEPAGE = "http://fuse.sf.net"
 DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE_${PN} = "LGPL"
 
diff --git a/packages/fuse/gmailfs_0.6.bb b/packages/fuse/gmailfs_0.6.bb
index 169b42d1f3..8c659441b3 100644
--- a/packages/fuse/gmailfs_0.6.bb
+++ b/packages/fuse/gmailfs_0.6.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "GmailFS provides a mountable Linux filesystem which uses your Gmail account as its storage medium."
 HOMEPAGE = "http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html"
-MAINTAINER = "koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPL"
 
 DEPENDS = "fuse libgmail python-fuse"
diff --git a/packages/fuse/sshfs-fuse_1.3.bb b/packages/fuse/sshfs-fuse_1.3.bb
index 70c502be82..2980a63ea8 100644
--- a/packages/fuse/sshfs-fuse_1.3.bb
+++ b/packages/fuse/sshfs-fuse_1.3.bb
@@ -1,6 +1,5 @@
 HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html"
 DESCRIPTION = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE."
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE_${PN} = "LGPL"
 
diff --git a/packages/fush/fush_0.9.0.bb b/packages/fush/fush_0.9.0.bb
index af8e0d66c1..3763a4f7e8 100644
--- a/packages/fush/fush_0.9.0.bb
+++ b/packages/fush/fush_0.9.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Fush is a shell replacement for security conscious admins."
 HOMEPAGE = "http://sourceforge.net/projects/foosh/"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "readline"
 PRIORITY = "optional"
 SECTION = "console/shells"
diff --git a/packages/gaim/gaim.inc b/packages/gaim/gaim.inc
index b00dc8f9ca..d2fb38881a 100644
--- a/packages/gaim/gaim.inc
+++ b/packages/gaim/gaim.inc
@@ -1,6 +1,5 @@
 SECTION = "x11/network"
 DESCRIPTION = "multi-protocol instant messaging client"
-MAINTAINER = "Mads Chr. Olesen <gaim@shiyee.dk>"
 LICENSE = "GPL"
 
 DEPENDS = "gtk+ gnutls virtual/libintl"
diff --git a/packages/galago/galago-daemon_0.3.4.bb b/packages/galago/galago-daemon_0.3.4.bb
index 508c8c9323..9e27f72605 100644
--- a/packages/galago/galago-daemon_0.3.4.bb
+++ b/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@linuxtogo.org>"
 LICENSE =       "GPL"
 DEPENDS =       "gettext libgalago dbus glib-2.0"
 PR = "r1"
diff --git a/packages/galago/libgalago_0.3.3.bb b/packages/galago/libgalago_0.3.3.bb
index 63a0b8230a..64064728b8 100644
--- a/packages/galago/libgalago_0.3.3.bb
+++ b/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@linuxtogo.org>"
 LICENSE =	"LGPL"
 DEPENDS = 	"gettext dbus glib-2.0"
 PR =		"r1"
diff --git a/packages/galculator/galculator_1.2.3.bb b/packages/galculator/galculator_1.2.3.bb
index a920b6b204..7cc87ebfc1 100644
--- a/packages/galculator/galculator_1.2.3.bb
+++ b/packages/galculator/galculator_1.2.3.bb
@@ -7,7 +7,6 @@ PROVIDES = "galculator"
 DESCRIPTION = "GTK Advanced Calculator"
 DEPENDS = "virtual/libc gtk+ libglade gnome-desktop"
 RDEPENDS = "gnome-desktop"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 SECTION = "gpe"
 PRIORITY = "optional"
 
diff --git a/packages/gammu/gammu_1.07.00.bb b/packages/gammu/gammu_1.07.00.bb
index 514819935c..04b5a25caa 100644
--- a/packages/gammu/gammu_1.07.00.bb
+++ b/packages/gammu/gammu_1.07.00.bb
@@ -4,7 +4,6 @@ DEPENDS = "bluez-libs"
 LICENSE = "GPL"
 HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
 AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 
 SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz "
 
diff --git a/packages/gbluezconf/gbluezconf_00.10.bb b/packages/gbluezconf/gbluezconf_00.10.bb
index 2b0f210954..1f6ecaf661 100644
--- a/packages/gbluezconf/gbluezconf_00.10.bb
+++ b/packages/gbluezconf/gbluezconf_00.10.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "GTK panel applet to control bluetooth stuff"
 LICENSE = "GPLv2"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 DEPENDS = "bluez-utils-dbus libglade dbus libnotify popt gtk+"
 SRC_URI = "http://www.cin.ufpe.br/~ckt/gbluezconf/${P}.tar.gz"
diff --git a/packages/gcalctool/gcalctool_5.7.32.bb b/packages/gcalctool/gcalctool_5.7.32.bb
index cb416235a3..bad339482f 100644
--- a/packages/gcalctool/gcalctool_5.7.32.bb
+++ b/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/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb
index f46c481f69..8852f81def 100644
--- a/packages/gcc/gcc_3.3.3.bb
+++ b/packages/gcc/gcc_3.3.3.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/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb
index c3df66d720..49f14cd888 100644
--- a/packages/gcc/gcc_3.3.4.bb
+++ b/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/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb
index 906465b1a9..e1f73eaea5 100644
--- a/packages/gcc/gcc_3.4.3.bb
+++ b/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/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index fece12cab0..adc1545b99 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/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/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index cf9d704c45..430bbef0d4 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.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/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 73ff96e28c..f812897786 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/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 = "r3"
 
diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb
index 5bf4fb0b99..c332feb463 100644
--- a/packages/gcc/gcc_csl-arm.bb
+++ b/packages/gcc/gcc_csl-arm.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>"
 BINV = "3.4.4"
 PV = "3.4.4+csl-arm-${SRCDATE}"
 PR = "r0"
diff --git a/packages/gchub/gchub-module_svn.bb b/packages/gchub/gchub-module_svn.bb
index 676e0b0804..41a3d63f3e 100644
--- a/packages/gchub/gchub-module_svn.bb
+++ b/packages/gchub/gchub-module_svn.bb
@@ -2,7 +2,6 @@ SECTION = "base"
 PRIORITY = "optional"
 DESCRIPTION = "Kernel module for the GameCube Hub input device"
 DEPENDS = "virtual/kernel"
-MAINTAINER = "Micah Dowty <micah@navi.cx>"
 LICENSE = "GPL"
 PV = "1:0.0+svn${SRCDATE}"
 
diff --git a/packages/gd/gd_2.0.21.bb b/packages/gd/gd_2.0.21.bb
index 5bc646b7cf..03a506b882 100644
--- a/packages/gd/gd_2.0.21.bb
+++ b/packages/gd/gd_2.0.21.bb
@@ -1,7 +1,6 @@
 SECTION = "libs"
 LICENSE = "GD"
 DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "libpng jpeg zlib"
 
 SRC_URI = "http://www.boutell.com/gd/http/gd-${PV}.tar.gz"
diff --git a/packages/gd/gd_2.0.22.bb b/packages/gd/gd_2.0.22.bb
index 1d05bb9169..a54809bf3b 100644
--- a/packages/gd/gd_2.0.22.bb
+++ b/packages/gd/gd_2.0.22.bb
@@ -1,7 +1,6 @@
 SECTION = "libs"
 LICENSE = "GD"
 DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "libpng jpeg zlib"
 PR = "r1"
 
diff --git a/packages/gd/gd_2.0.33.bb b/packages/gd/gd_2.0.33.bb
index 1d564fced9..78500bbcbd 100644
--- a/packages/gd/gd_2.0.33.bb
+++ b/packages/gd/gd_2.0.33.bb
@@ -1,7 +1,6 @@
 SECTION = "libs"
 LICENSE = "GD"
 DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "libpng jpeg zlib"
 PR = "r0"
 
diff --git a/packages/gdb/gdb-cross_6.1.bb b/packages/gdb/gdb-cross_6.1.bb
index 10c5dd25af..8ab16527ac 100644
--- a/packages/gdb/gdb-cross_6.1.bb
+++ b/packages/gdb/gdb-cross_6.1.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "gdb - GNU debugger"
 SECTION = "devel"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "ncurses-native"
 
 inherit autotools sdk
diff --git a/packages/gdb/gdb-cross_6.2.1.bb b/packages/gdb/gdb-cross_6.2.1.bb
index fcaca548fb..32076b529e 100644
--- a/packages/gdb/gdb-cross_6.2.1.bb
+++ b/packages/gdb/gdb-cross_6.2.1.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "gdb - GNU debugger"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "ncurses-native"
 
 inherit autotools sdk
diff --git a/packages/gdb/gdb-cross_6.2.bb b/packages/gdb/gdb-cross_6.2.bb
index 10c5dd25af..8ab16527ac 100644
--- a/packages/gdb/gdb-cross_6.2.bb
+++ b/packages/gdb/gdb-cross_6.2.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "gdb - GNU debugger"
 SECTION = "devel"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "ncurses-native"
 
 inherit autotools sdk
diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb
index 601f4a0750..45cb196d9d 100644
--- a/packages/gdb/gdb-cross_6.3.bb
+++ b/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/packages/gdb/gdb-cross_6.4.bb b/packages/gdb/gdb-cross_6.4.bb
index 8cd91ab7f9..7c9180ad6a 100644
--- a/packages/gdb/gdb-cross_6.4.bb
+++ b/packages/gdb/gdb-cross_6.4.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "gdb - GNU debugger"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Shane Volpe <shanevolpe@gmail.com>"
 LICENSE = "GPL"
 DEPENDS = "ncurses-native"
 
diff --git a/packages/gdb/gdb_6.1.bb b/packages/gdb/gdb_6.1.bb
index ec72ec0ecc..797148f262 100644
--- a/packages/gdb/gdb_6.1.bb
+++ b/packages/gdb/gdb_6.1.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "gdb - GNU debugger"
 SECTION = "devel"
 PRIORITY = "optional"
-MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "ncurses readline"
 
 PACKAGES =+ 'gdbserver '
diff --git a/packages/gdb/gdb_6.2.1.bb b/packages/gdb/gdb_6.2.1.bb
index 5bd3b2b51c..d8aa548d8f 100644
--- a/packages/gdb/gdb_6.2.1.bb
+++ b/packages/gdb/gdb_6.2.1.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"
 
 PACKAGES =+ 'gdbserver '
diff --git a/packages/gdb/gdb_6.2.bb b/packages/gdb/gdb_6.2.bb
index 37a630ca51..809c90173f 100644
--- a/packages/gdb/gdb_6.2.bb
+++ b/packages/gdb/gdb_6.2.bb
@@ -3,7 +3,6 @@ LICENSE="GPL"
 SECTION = "devel"
 PRIORITY = "optional"
 PR = "r1"
-MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "ncurses readline"
 
 PACKAGES =+ 'gdbserver '
diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb
index 3e755cee67..bce00f42f1 100644
--- a/packages/gdb/gdb_6.3.bb
+++ b/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/packages/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb
index 9a290a3e67..588d847218 100644
--- a/packages/gdb/gdb_6.4.bb
+++ b/packages/gdb/gdb_6.4.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"
 
diff --git a/packages/geda/geda-gattrib_20050820.bb b/packages/geda/geda-gattrib_20050820.bb
index fa73a2454a..74c19718f2 100644
--- a/packages/geda/geda-gattrib_20050820.bb
+++ b/packages/geda/geda-gattrib_20050820.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 FILES_${PN} += "${datadir}/gEDA"
diff --git a/packages/geda/geda-gnetlist_20050820.bb b/packages/geda/geda-gnetlist_20050820.bb
index 402ad0f56a..a0f7d60fb6 100644
--- a/packages/geda/geda-gnetlist_20050820.bb
+++ b/packages/geda/geda-gnetlist_20050820.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 PR = "r0"
diff --git a/packages/geda/geda-gschem_20050820.bb b/packages/geda/geda-gschem_20050820.bb
index 441acbd2d6..6ca5e4f77a 100644
--- a/packages/geda/geda-gschem_20050820.bb
+++ b/packages/geda/geda-gschem_20050820.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 PR = "r1"
diff --git a/packages/geda/geda-gsymcheck_20050820.bb b/packages/geda/geda-gsymcheck_20050820.bb
index 402ad0f56a..a0f7d60fb6 100644
--- a/packages/geda/geda-gsymcheck_20050820.bb
+++ b/packages/geda/geda-gsymcheck_20050820.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 PR = "r0"
diff --git a/packages/geda/geda-symbols_20050820.bb b/packages/geda/geda-symbols_20050820.bb
index 402ad0f56a..a0f7d60fb6 100644
--- a/packages/geda/geda-symbols_20050820.bb
+++ b/packages/geda/geda-symbols_20050820.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 PR = "r0"
diff --git a/packages/geda/geda-utils_20050820.bb b/packages/geda/geda-utils_20050820.bb
index a7a4d84826..d5b71b3cf7 100644
--- a/packages/geda/geda-utils_20050820.bb
+++ b/packages/geda/geda-utils_20050820.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "gEDA/gaf's Utilities"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 FILES_${PN} += "${datadir}/gEDA"
diff --git a/packages/geda/geda_20050820.bb b/packages/geda/geda_20050820.bb
index 77a2765512..0ca490a664 100644
--- a/packages/geda/geda_20050820.bb
+++ b/packages/geda/geda_20050820.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "GUI/Project Manager for teh gEDA suite"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 FILES_${PN} += "${datadir}/gEDA"
diff --git a/packages/geda/libgeda_20050820.bb b/packages/geda/libgeda_20050820.bb
index 8e8046ccef..e27e6f65ae 100644
--- a/packages/geda/libgeda_20050820.bb
+++ b/packages/geda/libgeda_20050820.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 PR = "r1"
diff --git a/packages/gemdropx/gemdropx_0.9.bb b/packages/gemdropx/gemdropx_0.9.bb
index 4f96715b79..688d3eb901 100644
--- a/packages/gemdropx/gemdropx_0.9.bb
+++ b/packages/gemdropx/gemdropx_0.9.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Classic arcade puzzle game - SDL edition."
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.newbreedsoftware.com/gemdropx/"
 PR = "r4"
diff --git a/packages/genlist/genlist.bb b/packages/genlist/genlist.bb
index 4fd6160cc2..467a5ee7bd 100644
--- a/packages/genlist/genlist.bb
+++ b/packages/genlist/genlist.bb
@@ -1,6 +1,5 @@
 SECTION = "utility"
 DESCRIPTION = "IP Address List Generator"
-MAINTAINER = "Bob Davies (tyggerbob@gmail.com)"
 
 SRC_URI = "file://genlist.c \
 	   file://Makefile"
diff --git a/packages/geode-drivers/geode-accessbus5536_2.6.11.bb b/packages/geode-drivers/geode-accessbus5536_2.6.11.bb
index 999f75d7f7..a8bf901b6f 100644
--- a/packages/geode-drivers/geode-accessbus5536_2.6.11.bb
+++ b/packages/geode-drivers/geode-accessbus5536_2.6.11.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION = "Linux Access Bus driver for the AMD Geode 5535/5536"
 HOMEPAGE = "http://www.amd.com/embedded"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 
 PR = "r0"
 AMD_DRIVER_VERSION = "01.00.0401"
diff --git a/packages/geode-drivers/geode-aeslx_2.6.11.bb b/packages/geode-drivers/geode-aeslx_2.6.11.bb
index 6f9e4d4d7d..85fffc1cdf 100644
--- a/packages/geode-drivers/geode-aeslx_2.6.11.bb
+++ b/packages/geode-drivers/geode-aeslx_2.6.11.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION = "Linux AES Driver for the AMD Geode LX processor"
 HOMEPAGE = "http://www.amd.com/embedded"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 
 PR = "r0"
 AMD_DRIVER_VERSION = "02.01.0100"
diff --git a/packages/geode-drivers/geode-alsa5536_2.6.11.bb b/packages/geode-drivers/geode-alsa5536_2.6.11.bb
index 2327ae067b..ff2fcd8df0 100644
--- a/packages/geode-drivers/geode-alsa5536_2.6.11.bb
+++ b/packages/geode-drivers/geode-alsa5536_2.6.11.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION = "Linux 2.6.11 ALSA Audio Driver for the AMD Geode 5535/5536 companion chip"
 HOMEPAGE = "http://www.amd.com/embedded"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 
 PR = "r0"
 AMD_DRIVER_VERSION = "1.00.0500"
diff --git a/packages/geode-drivers/geode-modules.inc b/packages/geode-drivers/geode-modules.inc
index 6b8d9bdbab..6c08b92786 100644
--- a/packages/geode-drivers/geode-modules.inc
+++ b/packages/geode-drivers/geode-modules.inc
@@ -4,7 +4,6 @@
 
 LICENSE = "GPL"
 HOMEPAGE = "http://www.amd.com/embedded"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 
 inherit autotools module-base
 
diff --git a/packages/geode-drivers/geode-v4l2lx_2.6.11.bb b/packages/geode-drivers/geode-v4l2lx_2.6.11.bb
index c5dc37db84..8b775a703c 100644
--- a/packages/geode-drivers/geode-v4l2lx_2.6.11.bb
+++ b/packages/geode-drivers/geode-v4l2lx_2.6.11.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION = "Linux video capture/overlay driver for the AMD Geode LX"
 HOMEPAGE = "http://www.amd.com/embedded"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 
 PR = "r0"
 AMD_DRIVER_VERSION = "03.02.0100"
diff --git a/packages/ghettotooth/ghettotooth.bb b/packages/ghettotooth/ghettotooth.bb
index 02bf533e4f..413d81a819 100644
--- a/packages/ghettotooth/ghettotooth.bb
+++ b/packages/ghettotooth/ghettotooth.bb
@@ -1,6 +1,5 @@
 SECTION = "net/misc"
 DESCRIPTION = "Bluetooth scanner"
-MAINTAINER = "Bob Davies <tyggerbob@gmail.com>"
 LICENSE = "GPL"
 RDEPENDS = "perl"
 
diff --git a/packages/giac/giac_0.5.0.bb b/packages/giac/giac_0.5.0.bb
index 5ab6c15c7e..36df3c22b7 100644
--- a/packages/giac/giac_0.5.0.bb
+++ b/packages/giac/giac_0.5.0.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "A free computer algebra system"
 HOMEPAGE = "http://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 DEPENDS = "fltk gmp mpfr gsl"
 #          ntl pari"
 
diff --git a/packages/giblib/giblib.inc b/packages/giblib/giblib.inc
index 05efc330ec..8540e29d60 100644
--- a/packages/giblib/giblib.inc
+++ b/packages/giblib/giblib.inc
@@ -1,7 +1,6 @@
 SECTION = "libs"
 DESCRIPTION = "giblib is a utility library that incorporates doubly linked \
 lists, some string functions, and a wrapper for imlib2."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "BSD"
 DEPENDS = "virtual/imlib2"
 
diff --git a/packages/gimp/gimp_2.2.10.bb b/packages/gimp/gimp_2.2.10.bb
index b2428f1440..eb6e385201 100644
--- a/packages/gimp/gimp_2.2.10.bb
+++ b/packages/gimp/gimp_2.2.10.bb
@@ -2,7 +2,6 @@ DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
 HOMEPAGE = 	"http://www.gimp.org"
 SECTION = "x11/graphics"
 LICENSE =	"GPL"
-MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 PR = "r1"
 
 SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-${PV}.tar.bz2"
diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb
index 1a1b704e26..eec0be6fd8 100644
--- a/packages/gimp/gimp_2.3.10.bb
+++ b/packages/gimp/gimp_2.3.10.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
 HOMEPAGE = "http://www.gimp.org"
 SECTION = "x11/graphics"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/gimp/gimp_2.3.7.bb b/packages/gimp/gimp_2.3.7.bb
index c8995d4205..59bc63d5ae 100644
--- a/packages/gimp/gimp_2.3.7.bb
+++ b/packages/gimp/gimp_2.3.7.bb
@@ -2,7 +2,6 @@ DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
 HOMEPAGE = 	"http://www.gimp.org"
 SECTION = "x11/graphics"
 LICENSE =	"GPL"
-MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 PR = "r1"
 
 SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2"
diff --git a/packages/gimp/gimp_2.3.8.bb b/packages/gimp/gimp_2.3.8.bb
index e8153d2c09..03d88ed522 100644
--- a/packages/gimp/gimp_2.3.8.bb
+++ b/packages/gimp/gimp_2.3.8.bb
@@ -2,7 +2,6 @@ DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
 HOMEPAGE = 	"http://www.gimp.org"
 SECTION = "x11/graphics"
 LICENSE =	"GPL"
-MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 PR = "r1"
 
 SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
diff --git a/packages/git/git.bb b/packages/git/git.bb
index 0bd00f8c93..7d5c2cbc35 100644
--- a/packages/git/git.bb
+++ b/packages/git/git.bb
@@ -2,7 +2,6 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 DESCRIPTION = "The git revision control system used by the Linux kernel developers"
 DEPENDS = "openssl curl"
-MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>"
 
 PKGDATE = "${@time.strftime('%Y-%m-%d',time.gmtime())}"
 
diff --git a/packages/gkdial/gkdial_1.8.1.bb b/packages/gkdial/gkdial_1.8.1.bb
index 6bd9d5131d..c5b23c4939 100644
--- a/packages/gkdial/gkdial_1.8.1.bb
+++ b/packages/gkdial/gkdial_1.8.1.bb
@@ -3,7 +3,6 @@ inherit autotools pkgconfig gconf
 DESCRIPTION = "GTK PPP dialing tool"
 DEPENDS = "gconf-dbus gtk+ libglade gettext ppp gpe-su"
 RDEPENDS = "ppp gconf-dbus gpe-su"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 SECTION = "gpe"
 PRIORITY = "optional"
 
diff --git a/packages/gkrellm/gkrellm_2.2.7.bb b/packages/gkrellm/gkrellm_2.2.7.bb
index c2bf9ab10a..5fd83e6923 100644
--- a/packages/gkrellm/gkrellm_2.2.7.bb
+++ b/packages/gkrellm/gkrellm_2.2.7.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/utils"
 DESCRIPTION = "GKrellM is a GTK-based stacked monitor program."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "gtk+ glib-2.0 libsm libice"
 
diff --git a/packages/glib-1.2/glib-1.2-native_1.2.10.bb b/packages/glib-1.2/glib-1.2-native_1.2.10.bb
index e0ecede0b8..aa940ac268 100644
--- a/packages/glib-1.2/glib-1.2-native_1.2.10.bb
+++ b/packages/glib-1.2/glib-1.2-native_1.2.10.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "GLib 1.2 is a deprecated libray to \
 provide support for old glib 1.2 based applications"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = ""
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glib-1.2-${PV}"
diff --git a/packages/glib-1.2/glib-1.2_1.2.10.bb b/packages/glib-1.2/glib-1.2_1.2.10.bb
index 58ab82edd9..77cbee2a14 100644
--- a/packages/glib-1.2/glib-1.2_1.2.10.bb
+++ b/packages/glib-1.2/glib-1.2_1.2.10.bb
@@ -3,7 +3,6 @@ provide support for old glib 1.2 based applications"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-1.2-native"
 PR = "r2"
 
diff --git a/packages/glib-2.0/glib-2.0-native_2.4.6.bb b/packages/glib-2.0/glib-2.0-native_2.4.6.bb
index 449443ce94..507ffedd09 100644
--- a/packages/glib-2.0/glib-2.0-native_2.4.6.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.4.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 = "gtk-doc-native"
 PR = "r6"
 
diff --git a/packages/glib-2.0/glib-2.0-native_2.6.0.bb b/packages/glib-2.0/glib-2.0-native_2.6.0.bb
index 15e25e226a..354b8c9cc6 100644
--- a/packages/glib-2.0/glib-2.0-native_2.6.0.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.6.0.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 = "r1"
 
diff --git a/packages/glib-2.0/glib-2.0-native_2.6.1.bb b/packages/glib-2.0/glib-2.0-native_2.6.1.bb
index 15e25e226a..354b8c9cc6 100644
--- a/packages/glib-2.0/glib-2.0-native_2.6.1.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.6.1.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 = "r1"
 
diff --git a/packages/glib-2.0/glib-2.0-native_2.6.2.bb b/packages/glib-2.0/glib-2.0-native_2.6.2.bb
index 3e7aa708e0..1ba63f92e2 100644
--- a/packages/glib-2.0/glib-2.0-native_2.6.2.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.6.2.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 = "r2"
 
diff --git a/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
index 7a4d385fe9..0e47fec346 100644
--- a/packages/glib-2.0/glib-2.0-native_2.6.5.bb
+++ b/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 = "r4"
 
diff --git a/packages/glib-2.0/glib-2.0_2.12.0.bb b/packages/glib-2.0/glib-2.0_2.12.0.bb
index 0dce9a6db7..e60d465fd5 100644
--- a/packages/glib-2.0/glib-2.0_2.12.0.bb
+++ b/packages/glib-2.0/glib-2.0_2.12.0.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/packages/glib-2.0/glib-2.0_2.12.1.bb b/packages/glib-2.0/glib-2.0_2.12.1.bb
index c796f08090..064f2f7f96 100644
--- a/packages/glib-2.0/glib-2.0_2.12.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.12.1.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/packages/glib-2.0/glib-2.0_2.12.3.bb b/packages/glib-2.0/glib-2.0_2.12.3.bb
index c796f08090..064f2f7f96 100644
--- a/packages/glib-2.0/glib-2.0_2.12.3.bb
+++ b/packages/glib-2.0/glib-2.0_2.12.3.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/packages/glib-2.0/glib-2.0_2.2.3.bb b/packages/glib-2.0/glib-2.0_2.2.3.bb
index 10d2ea8fa8..4288cb62eb 100644
--- a/packages/glib-2.0/glib-2.0_2.2.3.bb
+++ b/packages/glib-2.0/glib-2.0_2.2.3.bb
@@ -6,7 +6,6 @@ loop abstraction, and so on. It works on many \
 UNIX-like platforms, Windows, OS/2 and BeOS."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0-native"
 DEPENDS += "virtual/libiconv virtual/libintl"
 
diff --git a/packages/glib-2.0/glib-2.0_2.4.5.bb b/packages/glib-2.0/glib-2.0_2.4.5.bb
index bb4127f84d..c6f06e88b6 100644
--- a/packages/glib-2.0/glib-2.0_2.4.5.bb
+++ b/packages/glib-2.0/glib-2.0_2.4.5.bb
@@ -6,7 +6,6 @@ loop abstraction, and so on. It works on many \
 UNIX-like platforms, Windows, OS/2 and BeOS."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0-native"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
diff --git a/packages/glib-2.0/glib-2.0_2.4.6.bb b/packages/glib-2.0/glib-2.0_2.4.6.bb
index e3722a8e96..d5b9b6f73f 100644
--- a/packages/glib-2.0/glib-2.0_2.4.6.bb
+++ b/packages/glib-2.0/glib-2.0_2.4.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/packages/glib-2.0/glib-2.0_2.6.0.bb b/packages/glib-2.0/glib-2.0_2.6.0.bb
index 212afa7e01..9e55bf0305 100644
--- a/packages/glib-2.0/glib-2.0_2.6.0.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.0.bb
@@ -6,7 +6,6 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
 SECTION = "libs"
 LICENSE = "LGPL"
 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/packages/glib-2.0/glib-2.0_2.6.1.bb b/packages/glib-2.0/glib-2.0_2.6.1.bb
index 64047a865f..289b81aaaf 100644
--- a/packages/glib-2.0/glib-2.0_2.6.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.1.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/packages/glib-2.0/glib-2.0_2.6.2.bb b/packages/glib-2.0/glib-2.0_2.6.2.bb
index 64047a865f..289b81aaaf 100644
--- a/packages/glib-2.0/glib-2.0_2.6.2.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.2.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/packages/glib-2.0/glib-2.0_2.6.3.bb b/packages/glib-2.0/glib-2.0_2.6.3.bb
index 64047a865f..289b81aaaf 100644
--- a/packages/glib-2.0/glib-2.0_2.6.3.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.3.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/packages/glib-2.0/glib-2.0_2.6.4.bb b/packages/glib-2.0/glib-2.0_2.6.4.bb
index 64047a865f..289b81aaaf 100644
--- a/packages/glib-2.0/glib-2.0_2.6.4.bb
+++ b/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/packages/glib-2.0/glib-2.0_2.8.1.bb b/packages/glib-2.0/glib-2.0_2.8.1.bb
index b3891f108b..ecb7115dd1 100644
--- a/packages/glib-2.0/glib-2.0_2.8.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.1.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/packages/glib-2.0/glib-2.0_2.8.2.bb b/packages/glib-2.0/glib-2.0_2.8.2.bb
index 22849917d6..d72803b564 100644
--- a/packages/glib-2.0/glib-2.0_2.8.2.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.2.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/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index d4bd52f89a..9c7765f1ea 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -5,7 +5,6 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
@@ -252,7 +251,6 @@ require glibc-package.bbclass
 
 PACKAGES_unslung = "libc6-unslung"
 PACKAGE_ARCH_unslung = "nslu2"
-MAINTAINER_libc6-unslung = "NSLU2 Linux <www.nslu2-linux.org>"
 RDEPENDS_libc6-unslung = "nslu2-linksys-libs"
 RPROVIDES_libc6-unslung = "libc6"
 
diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index 2857767774..471262373c 100644
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.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>"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index fdd91172c9..1d87f0e37c 100644
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.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>"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index 092964e5ae..aa119f0a7b 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.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>"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index a5957c476e..4d401d11f0 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.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>"
 DEFAULT_PREFERENCE_i586 = "0"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 8943e1c565..e723b2febd 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/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/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb
index 9dc41dd238..396e0d535b 100644
--- a/packages/glibc/glibc_cvs.bb
+++ b/packages/glibc/glibc_cvs.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"
 PR = "r5"
diff --git a/packages/gnocky/gnocky_0.0.3.bb b/packages/gnocky/gnocky_0.0.3.bb
index e0bd02ecaa..83065afdef 100644
--- a/packages/gnocky/gnocky_0.0.3.bb
+++ b/packages/gnocky/gnocky_0.0.3.bb
@@ -2,7 +2,6 @@ SRC_URI = "http://gnokii.org/download/gnocky/gnocky-${PV}.tar.bz2"
 LICENSE = "GPL"
 DEPENDS = "gtk+ gnokii"
 DESCRIPTION = "GTK+ frontend for Gnokii"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 inherit autotools
 
diff --git a/packages/gnokii/gnokii_0.6.4.bb b/packages/gnokii/gnokii_0.6.4.bb
index f04086a758..34d1edeb0b 100644
--- a/packages/gnokii/gnokii_0.6.4.bb
+++ b/packages/gnokii/gnokii_0.6.4.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Cellphone tools and driver software"
 SRC_URI = "http://www.gnokii.org/download/gnokii/0.6.x/gnokii-${PV}.tar.bz2 \
 	file://configure.patch;patch=1"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 DEPENDS = "libxpm"
 
diff --git a/packages/gnome-themes/gnome-themes_2.6.2.bb b/packages/gnome-themes/gnome-themes_2.6.2.bb
index db021fa667..2c18b59654 100644
--- a/packages/gnome-themes/gnome-themes_2.6.2.bb
+++ b/packages/gnome-themes/gnome-themes_2.6.2.bb
@@ -1,5 +1,4 @@
 SECTION = "x11/base"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "LGPL"
 DESCRIPTION = "GNOME themes"
 
diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb
index f8be0c4eee..865379b71c 100644
--- a/packages/gnome/gconf-dbus_cvs.bb
+++ b/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/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index 5ab880d921..d4d9cde477 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -2,7 +2,6 @@ SECTION = "x11/utils"
 DEPENDS = "gtk+ glib-2.0 dbus dbus-glib 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/packages/gnome/gnome-games_2.6.1.bb b/packages/gnome/gnome-games_2.6.1.bb
index db74c5cfe7..d1ac41b08a 100644
--- a/packages/gnome/gnome-games_2.6.1.bb
+++ b/packages/gnome/gnome-games_2.6.1.bb
@@ -1,5 +1,4 @@
 LICENSE = "GPL"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "guile gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common"
 PR = "r2"
 
diff --git a/packages/gnome/gnome-menus_2.10.2.bb b/packages/gnome/gnome-menus_2.10.2.bb
index 53b66a6e9b..e0aa0919a5 100644
--- a/packages/gnome/gnome-menus_2.10.2.bb
+++ b/packages/gnome/gnome-menus_2.10.2.bb
@@ -1,7 +1,6 @@
 DEPENDS = "gnome-vfs libxml2 gconf popt gtk+"
 LICENSE = "GPL"
 
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/gnome-menus_2.12.0.bb b/packages/gnome/gnome-menus_2.12.0.bb
index ff65f1f9ad..30e0abc14f 100644
--- a/packages/gnome/gnome-menus_2.12.0.bb
+++ b/packages/gnome/gnome-menus_2.12.0.bb
@@ -1,7 +1,6 @@
 DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
 LICENSE = "GPL"
 
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/gnome-panel_2.10.1.bb b/packages/gnome/gnome-panel_2.10.1.bb
index 3d7ce2f392..3bb11dc052 100644
--- a/packages/gnome/gnome-panel_2.10.1.bb
+++ b/packages/gnome/gnome-panel_2.10.1.bb
@@ -1,5 +1,4 @@
 LICENSE = "GPL"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus"
 
 inherit gnome pkgconfig
diff --git a/packages/gnome/libsoup_2.2.7.bb b/packages/gnome/libsoup_2.2.7.bb
index f01cb19dbc..c0f0ab22bf 100644
--- a/packages/gnome/libsoup_2.2.7.bb
+++ b/packages/gnome/libsoup_2.2.7.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "An HTTP library implementation in C"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
 DEPENDS = "glib-2.0 gnutls libxml2"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/gnome/libsoup_2.2.93.bb b/packages/gnome/libsoup_2.2.93.bb
index 33a4f16d06..ab594a91c3 100644
--- a/packages/gnome/libsoup_2.2.93.bb
+++ b/packages/gnome/libsoup_2.2.93.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "An HTTP library implementation in C"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
 DEPENDS = "glib-2.0 gnutls libxml2"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/gnome/libsoup_2.2.96.bb b/packages/gnome/libsoup_2.2.96.bb
index 33a4f16d06..ab594a91c3 100644
--- a/packages/gnome/libsoup_2.2.96.bb
+++ b/packages/gnome/libsoup_2.2.96.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "An HTTP library implementation in C"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
 DEPENDS = "glib-2.0 gnutls libxml2"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/gnumeric/gnumeric_1.6.3.bb b/packages/gnumeric/gnumeric_1.6.3.bb
index 7fa400e6d8..c41b971530 100644
--- a/packages/gnumeric/gnumeric_1.6.3.bb
+++ b/packages/gnumeric/gnumeric_1.6.3.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/utils"
 S = "${WORKDIR}/gnumeric-${PV}"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui"
 DESCRIPTION = "Gnumeric spreadsheet for GNOME"
 
diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb
index 948dc579b3..ae97097e15 100644
--- a/packages/gnuplot/gnuplot_4.0.0.bb
+++ b/packages/gnuplot/gnuplot_4.0.0.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \
 SECTION = "console/scientific"
 LICENSE = "BSD-4"
 PRIORITY = "optional"
-MAINTAINER = "Philip Frampton"
 DEPENDS = "virtual/libx11 libpng gd readline"
 PR = "r3"
 
diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb
index 0f7ddf1937..0bacbddf47 100644
--- a/packages/gnuplot/qtplot_0.2.bb
+++ b/packages/gnuplot/qtplot_0.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "QT Gnuplot is a front end for Gnuplot. Install Opie-Embedded \
 console to enable the Launch Gnuplot menu option."
 SECTION    = "opie/applications"
 PRIORITY   = "optional"
-MAINTAINER = "Philip Frampton"
 LICENSE    = "GPL"
 PRIORITY   = "optional"
 
diff --git a/packages/gnutls/gnutls_1.3.5.bb b/packages/gnutls/gnutls_1.3.5.bb
index 18b3b03ee2..bcadacb41a 100644
--- a/packages/gnutls/gnutls_1.3.5.bb
+++ b/packages/gnutls/gnutls_1.3.5.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 DEPENDS = "zlib libgcrypt lzo"
-MAINTAINER = "Eric Shattow <lucent@gmail.com>"
 
 LICENSE = "LGPL"
 PR = "r4"
diff --git a/packages/gnutls/gnutls_1.4.0.bb b/packages/gnutls/gnutls_1.4.0.bb
index a425c3498a..c77cf38ed3 100644
--- a/packages/gnutls/gnutls_1.4.0.bb
+++ b/packages/gnutls/gnutls_1.4.0.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 DEPENDS = "zlib libgcrypt lzo"
-MAINTAINER = "Eric Shattow <lucent@gmail.com>"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 LICENSE = "LGPL"
 PR = "r1"
diff --git a/packages/gnuz/gnuz-levelmaker-native_0.1.1.bb b/packages/gnuz/gnuz-levelmaker-native_0.1.1.bb
index ec546bc98f..4fec8271b3 100644
--- a/packages/gnuz/gnuz-levelmaker-native_0.1.1.bb
+++ b/packages/gnuz/gnuz-levelmaker-native_0.1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Level maker for gnuZ"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Lukas Fraser"
 HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
diff --git a/packages/gnuz/gnuz-package-native_0.1.bb b/packages/gnuz/gnuz-package-native_0.1.bb
index 7d6c8829d3..d67553a877 100644
--- a/packages/gnuz/gnuz-package-native_0.1.bb
+++ b/packages/gnuz/gnuz-package-native_0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Level maker for gnuZ"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Lukas Fraser"
 HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb
index 9a164978ff..476b9ff5a6 100644
--- a/packages/gnuz/gnuz_0.3.bb
+++ b/packages/gnuz/gnuz_0.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "gnuZ is a Lemmings style game"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Lukas Fraser"
 HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
diff --git a/packages/gobby/gobby_0.4.1.bb b/packages/gobby/gobby_0.4.1.bb
index 8b7ccad199..f9474c8fe3 100644
--- a/packages/gobby/gobby_0.4.1.bb
+++ b/packages/gobby/gobby_0.4.1.bb
@@ -1,6 +1,5 @@
 LICENSE = "LGPL"
 HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/"
-MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 
 DEPENDS = "net6 gtkmm obby gtksourceview libxml++"
 inherit autotools pkgconfig
diff --git a/packages/gobby/gtksourceview_1.7.2.bb b/packages/gobby/gtksourceview_1.7.2.bb
index 084af175f7..6b4c8e686c 100644
--- a/packages/gobby/gtksourceview_1.7.2.bb
+++ b/packages/gobby/gtksourceview_1.7.2.bb
@@ -1,5 +1,4 @@
 LICENSE = "GPL"
-MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 
 DEPENDS = "gtk+ libgnomeprint"
 
diff --git a/packages/gobby/net6_1.2.2.bb b/packages/gobby/net6_1.2.2.bb
index f9154fcca9..5399cd57c6 100644
--- a/packages/gobby/net6_1.2.2.bb
+++ b/packages/gobby/net6_1.2.2.bb
@@ -1,6 +1,5 @@
 LICENSE = "LGPL"
 HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = "libsigc++-2.0"
 inherit autotools pkgconfig
diff --git a/packages/gobby/net6_1.3.1.bb b/packages/gobby/net6_1.3.1.bb
index 3bcf8811d9..bafc185322 100644
--- a/packages/gobby/net6_1.3.1.bb
+++ b/packages/gobby/net6_1.3.1.bb
@@ -1,6 +1,5 @@
 LICENSE = "LGPL"
 HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
 
 DEPENDS = "libsigc++-2.0 gnutls"
 inherit autotools pkgconfig
diff --git a/packages/gobby/obby_0.4.1.bb b/packages/gobby/obby_0.4.1.bb
index adf3a72571..f72ca51ab3 100644
--- a/packages/gobby/obby_0.4.1.bb
+++ b/packages/gobby/obby_0.4.1.bb
@@ -1,6 +1,5 @@
 LICENSE = "LGPL"
 HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/"
-MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 
 DEPENDS = "net6 gtkmm gmp"
 inherit autotools pkgconfig
diff --git a/packages/gomunicator/gomunicator_cvs.bb b/packages/gomunicator/gomunicator_cvs.bb
index 0b4e3faaf6..4c6e9daad2 100644
--- a/packages/gomunicator/gomunicator_cvs.bb
+++ b/packages/gomunicator/gomunicator_cvs.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://projects.linuxtogo.org/projects/gomunicator"
 LICENSE = "GPLv2"
 AUTHOR = "Robert Woerle"
 SECTION = "gpe"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libgpewidget gtk+ glib-2.0 alsa-lib dbus-glib"
 PV = "0.1.3+cvs${SRCDATE}"
 PR = "r1"
diff --git a/packages/gpe-appmgr/gpe-appmgr_2.8.bb b/packages/gpe-appmgr/gpe-appmgr_2.8.bb
index e4033822dd..e638bc9912 100644
--- a/packages/gpe-appmgr/gpe-appmgr_2.8.bb
+++ b/packages/gpe-appmgr/gpe-appmgr_2.8.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "GPE application launcher"
 DEPENDS = "libgpewidget libgpelaunch cairo libxsettings-client"
 SECTION = "gpe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/gpe-beam/gpe-beam_0.2.3.bb b/packages/gpe-beam/gpe-beam_0.2.3.bb
index 1f71522d5b..b009b10372 100644
--- a/packages/gpe-beam/gpe-beam_0.2.3.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.3.bb
@@ -5,4 +5,3 @@ DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex"
 RDEPENDS = "libopenobex-1.0-1"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
diff --git a/packages/gpe-beam/gpe-beam_0.2.6.bb b/packages/gpe-beam/gpe-beam_0.2.6.bb
index d57cb53b83..71af4db7e6 100644
--- a/packages/gpe-beam/gpe-beam_0.2.6.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.6.bb
@@ -7,7 +7,6 @@ DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-gli
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 LICENSE = "GPL"
 
 SRC_URI += "file://vcard-send.patch;patch=1;pnum=0"
diff --git a/packages/gpe-beam/gpe-beam_0.2.7.bb b/packages/gpe-beam/gpe-beam_0.2.7.bb
index 4b54bef82d..51b99fcfc6 100644
--- a/packages/gpe-beam/gpe-beam_0.2.7.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.7.bb
@@ -7,7 +7,6 @@ DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-gli
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 LICENSE = "GPL"
 
 SRC_URI += "file://decl.patch;patch=1;pnum=0"
diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb
index b1a8f4f780..f68b50341a 100644
--- a/packages/gpe-beam/gpe-beam_0.2.8.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.8.bb
@@ -7,7 +7,6 @@ DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-gli
 RDEPENDS = "irda-utils"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 LICENSE = "GPL"
 
 SRC_URI += "file://dbus-new-api.patch;patch=1"
diff --git a/packages/gpe-beam/gpe-beam_0.2.9.bb b/packages/gpe-beam/gpe-beam_0.2.9.bb
index 6b8c4b9f55..8275cf6c3a 100644
--- a/packages/gpe-beam/gpe-beam_0.2.9.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.9.bb
@@ -3,7 +3,6 @@ DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-gli
 RDEPENDS = "irda-utils"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 LICENSE = "GPL"
 
 inherit gpe
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
index 2b63d4a7e5..f3129fcf17 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "GPE bluetooth support"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus libcontactsdb"
 RDEPENDS = "bluez-utils-dbus blueprobe"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
index b7884c5374..2eaa992955 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
@@ -2,7 +2,6 @@ LICENSE     = "GPL"
 DESCRIPTION = "GPE bluetooth support user interface tool."
 SECTION     = "gpe"
 PRIORITY    = "optional"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r1"
 
 DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
index 1506bd4c8b..7720647cf8 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
@@ -2,7 +2,6 @@ LICENSE     = "GPL"
 DESCRIPTION = "GPE bluetooth support user interface tool."
 SECTION     = "gpe"
 PRIORITY    = "optional"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r0"
 
 DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
index 1506bd4c8b..7720647cf8 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
@@ -2,7 +2,6 @@ LICENSE     = "GPL"
 DESCRIPTION = "GPE bluetooth support user interface tool."
 SECTION     = "gpe"
 PRIORITY    = "optional"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r0"
 
 DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
index 77cf675e21..24d3ff48ce 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
@@ -2,7 +2,6 @@ LICENSE     = "GPL"
 DESCRIPTION = "GPE bluetooth support user interface tool."
 SECTION     = "gpe"
 PRIORITY    = "optional"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r1"
 
 DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
diff --git a/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb b/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb
index 5eeee0fffa..0cdafb7275 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "An Enlightenment theme for gpe-bootsplash"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 DEPENDS = "gpe-bootsplash"
 RDEPENDS = "gpe-bootsplash"
diff --git a/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb b/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb
index 9aa2e9bc00..c19ed49e69 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "An Enlightenment theme for gpe-bootsplash"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 DEPENDS = "gpe-bootsplash"
 RDEPENDS = "gpe-bootsplash"
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
index ba09ac20b0..6f54eadad0 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
@@ -1,7 +1,6 @@
 inherit gpe
 
 DEPENDS = "gtk+ librsvg"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
index 7d67d5eb59..414041dbcb 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
@@ -1,7 +1,6 @@
 inherit gpe
 
 DEPENDS = "gtk+ libsvg-cairo"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
index cd105fc32b..c07ef46363 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
@@ -1,7 +1,6 @@
 inherit gpe
 
 DEPENDS = "gtk+ libsvg-cairo"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
index ed69f01df1..ededb292e8 100644
--- a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
+++ b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
@@ -1,6 +1,5 @@
 LICENSE =	"GPL"
 DESCRIPTION =	"Buttonbox for gpe"
-MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"libgpewidget libgpelaunch"
 
diff --git a/packages/gpe-calendar/gpe-calendar_0.72.bb b/packages/gpe-calendar/gpe-calendar_0.72.bb
index 10bb221ff2..1b648ce52e 100644
--- a/packages/gpe-calendar/gpe-calendar_0.72.bb
+++ b/packages/gpe-calendar/gpe-calendar_0.72.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite."
 SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 LICENSE = "GPL"
 
 DEPENDS = "dbus-glib libeventdb libschedule libxsettings-client libgpepimc libgpevtype"
diff --git a/packages/gpe-clock/gpe-clock_0.14.bb b/packages/gpe-clock/gpe-clock_0.14.bb
index ff3f0883a0..9dcb7a6fcb 100644
--- a/packages/gpe-clock/gpe-clock_0.14.bb
+++ b/packages/gpe-clock/gpe-clock_0.14.bb
@@ -3,7 +3,6 @@ inherit gpe
 DESCRIPTION = "GPE panel clock"
 DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd"
 RDEPENDS = "gpe-announce atd"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/gpe-clock/gpe-clock_0.20.bb b/packages/gpe-clock/gpe-clock_0.20.bb
index 16205722ae..121db0c807 100644
--- a/packages/gpe-clock/gpe-clock_0.20.bb
+++ b/packages/gpe-clock/gpe-clock_0.20.bb
@@ -3,7 +3,6 @@ inherit gpe
 DESCRIPTION = "GPE panel clock"
 DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch"
 RDEPENDS = "gpe-announce atd"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/gpe-clock/gpe-clock_0.21.bb b/packages/gpe-clock/gpe-clock_0.21.bb
index f9b8c4dbe1..51b001208b 100644
--- a/packages/gpe-clock/gpe-clock_0.21.bb
+++ b/packages/gpe-clock/gpe-clock_0.21.bb
@@ -3,7 +3,6 @@ inherit gpe
 DESCRIPTION = "GPE panel clock"
 DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch"
 RDEPENDS = "gpe-announce atd"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/gpe-conf/gpe-conf_0.2.2.bb b/packages/gpe-conf/gpe-conf_0.2.2.bb
index 995a42f621..deea518a86 100644
--- a/packages/gpe-conf/gpe-conf_0.2.2.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Configuration applets for GPE"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 LICENSE = "GPL"
 
 DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client"
diff --git a/packages/gpe-conf/gpe-conf_cvs.bb b/packages/gpe-conf/gpe-conf_cvs.bb
index e8da8a2646..9825702ecb 100644
--- a/packages/gpe-conf/gpe-conf_cvs.bb
+++ b/packages/gpe-conf/gpe-conf_cvs.bb
@@ -3,7 +3,6 @@ DEFAULT_PREFERENCE = "-1"
 DESCRIPTION = "Configuration applets for GPE"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 LICENSE = "GPL"
 
 DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons"
diff --git a/packages/gpe-dm/gpe-dm_0.48.bb b/packages/gpe-dm/gpe-dm_0.48.bb
index 7d08acb540..51af5a98d9 100644
--- a/packages/gpe-dm/gpe-dm_0.48.bb
+++ b/packages/gpe-dm/gpe-dm_0.48.bb
@@ -4,7 +4,6 @@ inherit gpe update-rc.d
 DESCRIPTION = "GPE Display Manager"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0 xserver-common"
 RDEPENDS_${PN} += "procps xserver-common"
 PR = "r3"
diff --git a/packages/gpe-edit/gpe-edit_0.29.bb b/packages/gpe-edit/gpe-edit_0.29.bb
index 676e2e7cda..f4089be7ff 100644
--- a/packages/gpe-edit/gpe-edit_0.29.bb
+++ b/packages/gpe-edit/gpe-edit_0.29.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 inherit gpe
 
 DEPENDS = "gtk+ libdisplaymigration libgpewidget"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 DESCRIPTION = "Editor for the GPE Palmtop Environment"
 
diff --git a/packages/gpe-edit/gpe-edit_0.31.bb b/packages/gpe-edit/gpe-edit_0.31.bb
index fe003fe338..a7c688a5d9 100644
--- a/packages/gpe-edit/gpe-edit_0.31.bb
+++ b/packages/gpe-edit/gpe-edit_0.31.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 inherit gpe
 
 DEPENDS = "gtk+ libgpewidget"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 DESCRIPTION = "Editor for the GPE Palmtop Environment"
 
diff --git a/packages/gpe-edit/gpe-edit_0.32.bb b/packages/gpe-edit/gpe-edit_0.32.bb
index e504ec2271..db15a3d7b6 100644
--- a/packages/gpe-edit/gpe-edit_0.32.bb
+++ b/packages/gpe-edit/gpe-edit_0.32.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 DESCRIPTION = "Editor for the GPE Palmtop Environment"
 LICENSE = "GPL"
diff --git a/packages/gpe-fsi/gpe-fsi_0.1.bb b/packages/gpe-fsi/gpe-fsi_0.1.bb
index 1092674485..479308d64c 100644
--- a/packages/gpe-fsi/gpe-fsi_0.1.bb
+++ b/packages/gpe-fsi/gpe-fsi_0.1.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "GPE frontend for libfsi-client"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "gpl"
 
 inherit gpe
diff --git a/packages/gpe-gallery/gpe-gallery_0.97.bb b/packages/gpe-gallery/gpe-gallery_0.97.bb
index 0f6e747b8a..4b4cfaebb8 100644
--- a/packages/gpe-gallery/gpe-gallery_0.97.bb
+++ b/packages/gpe-gallery/gpe-gallery_0.97.bb
@@ -7,7 +7,6 @@ SRC_URI += "file://makefile-fix.patch;patch=1"
 
 DEPENDS = "libgpewidget"
 SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 FILES_${PN} += "${datadir}/gpe/pixmaps"
 FILES_${PN} += "${datadir}/application-registry"
diff --git a/packages/gpe-icons/gpe-icons_0.25.bb b/packages/gpe-icons/gpe-icons_0.25.bb
index 8b57800f23..6276e9510b 100644
--- a/packages/gpe-icons/gpe-icons_0.25.bb
+++ b/packages/gpe-icons/gpe-icons_0.25.bb
@@ -4,7 +4,6 @@ SECTION = "gpe"
 
 RDEPENDS = "gdk-pixbuf-loader-png"
 
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 inherit gpe
 
diff --git a/packages/gpe-life/gpe-life_0.2.bb b/packages/gpe-life/gpe-life_0.2.bb
index 82ab1b1fc4..0f5acc2716 100644
--- a/packages/gpe-life/gpe-life_0.2.bb
+++ b/packages/gpe-life/gpe-life_0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Conway's Game of Life for GPE"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe/games"
 PR = "r1"
 
diff --git a/packages/gpe-mileage/gpe-mileage_0.1.bb b/packages/gpe-mileage/gpe-mileage_0.1.bb
index 7c3f78e2f2..2e452219df 100644
--- a/packages/gpe-mileage/gpe-mileage_0.1.bb
+++ b/packages/gpe-mileage/gpe-mileage_0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A mileage calculator for GPE"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 
 DEPENDS = "glib-2.0 gtk+ libglade sqlite"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
index 0b64c754e3..373a3fec75 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
@@ -3,7 +3,6 @@ inherit gpe
 DESCRIPTION = "GPE owner information dialog"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libgpewidget"
 LICENSE = "GPL"
 PR = "r1"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
index 9d4e52e46b..0b83e82397 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
@@ -3,7 +3,6 @@ inherit gpe
 DESCRIPTION = "GPE owner information dialog"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libgpewidget"
 PR = "r2"
 LICENSE = "GPL"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
index 243bbd1ba9..f0a57bd29f 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
@@ -3,7 +3,6 @@ inherit gpe
 DESCRIPTION = "GPE owner information dialog"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libgpewidget"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
index 243bbd1ba9..f0a57bd29f 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
@@ -3,7 +3,6 @@ inherit gpe
 DESCRIPTION = "GPE owner information dialog"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libgpewidget"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
index 243bbd1ba9..f0a57bd29f 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
@@ -3,7 +3,6 @@ inherit gpe
 DESCRIPTION = "GPE owner information dialog"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libgpewidget"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
index 243bbd1ba9..f0a57bd29f 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
@@ -3,7 +3,6 @@ inherit gpe
 DESCRIPTION = "GPE owner information dialog"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libgpewidget"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/gpe-screenshot/gpe-screenshot_0.4.bb b/packages/gpe-screenshot/gpe-screenshot_0.4.bb
index b64bdceb04..ce31febc3d 100644
--- a/packages/gpe-screenshot/gpe-screenshot_0.4.bb
+++ b/packages/gpe-screenshot/gpe-screenshot_0.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "GPE screenshot application"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 PR = "r1"
 
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb
index 9d199cd780..9cb6937b87 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb
@@ -6,7 +6,6 @@ inherit gpe
 DESCRIPTION = "GPE session startup scripts"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 RDEPENDS = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
 DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
index b9178ac6bf..752bcb9ac1 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
@@ -6,7 +6,6 @@ inherit gpe
 DESCRIPTION = "GPE session startup scripts"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
 DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
index 986810e8ba..d593f6fbc9 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
@@ -6,7 +6,6 @@ inherit gpe
 DESCRIPTION = "GPE session startup scripts"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
 DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb
index 9364dcab2e..2ba0641ceb 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb
@@ -6,7 +6,6 @@ inherit gpe
 DESCRIPTION = "GPE session startup scripts"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
 DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb
index d7a3054149..ce8d627179 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.65.bb
@@ -6,7 +6,6 @@ inherit gpe
 DESCRIPTION = "GPE session startup scripts"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
 DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb
index 3b8f8a958f..0eb706b29b 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb
@@ -6,7 +6,6 @@ inherit gpe
 DESCRIPTION = "GPE session startup scripts"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 RDEPENDS_${PN} = "matchbox matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
 DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index 8879833c6e..f75ab216cd 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "GPE session startup scripts"
 LICENSE = "GPL"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 RDEPENDS_${PN} = "matchbox matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
 DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
diff --git a/packages/gpe-shield/gpe-shield_0.9.bb b/packages/gpe-shield/gpe-shield_0.9.bb
index 898d67a181..c47e00d52d 100644
--- a/packages/gpe-shield/gpe-shield_0.9.bb
+++ b/packages/gpe-shield/gpe-shield_0.9.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "GPE network security tool"
 SECTION     = "gpe"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 LICENSE     = "GPL"
 
 DEPENDS     = "libgpewidget iptables virtual/kernel"
diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
index 930599fa8f..b4878406de 100644
--- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
+++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
@@ -5,7 +5,6 @@ inherit gpe pkgconfig
 
 DEPENDS = "libgpewidget"
 SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 SECTION = "gpe"
 PRIORITY = "optional"
 DESCRIPTION = "A GPE notebook to sketch your notes"
diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
index e899acbcab..60bb1b3d76 100644
--- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
+++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
@@ -4,7 +4,6 @@ inherit gpe pkgconfig
 
 DEPENDS = "libgpewidget"
 SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 SECTION = "gpe"
 PRIORITY = "optional"
 DESCRIPTION = "A GPE notebook to sketch your notes"
diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
index 4634b1b575..1b59f29f62 100644
--- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
+++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
@@ -1,5 +1,4 @@
 DESCRIPTION =	"GTK+ clearlooks theme adjusted for GPE"
-MAINTAINER =	"Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE =       "GPL"
 
 PR=		"r1"
diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
index 5cedd57e9c..3c9403d08d 100644
--- a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
+++ b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
@@ -1,5 +1,4 @@
 DESCRIPTION =	"GTK+ clearlooks theme adjusted for GPE"
-MAINTAINER =	"Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE =       "GPL"
 
 PR=		"r0"
diff --git a/packages/gpe-themes/gpe-theme-e17_0.1.bb b/packages/gpe-themes/gpe-theme-e17_0.1.bb
index 9ba24d595f..b509e3d4ec 100644
--- a/packages/gpe-themes/gpe-theme-e17_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-e17_0.1.bb
@@ -1,5 +1,4 @@
 DESCRIPTION =	"GTK+ enlightenment theme adjusted for GPE"
-MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 LICENSE = 	"MIT + GPL"
 PR=		"r0"
 
diff --git a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
index 6999e87b86..5e2bd90ce1 100644
--- a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
@@ -4,7 +4,6 @@ LICENSE = 		"gpe-theme-foxbox"
 PR = 			"r2"
 SECTION = 		"x11/base"
 DESCRIPTION = 	"Simple GPE theme using the Smooth theming engine."
-MAINTAINER = 	"Florian Boor <florian@kernelconcepts.de>"
 DEPENDS = 		"gtk-engines"
 RDEPENDS = 		"gtk-engine-smooth"
 S = 			"${WORKDIR}/foxbox"
diff --git a/packages/gpe-themes/gpe-theme-industrial_0.1.bb b/packages/gpe-themes/gpe-theme-industrial_0.1.bb
index 409f6d8a56..5d0a4b8da9 100644
--- a/packages/gpe-themes/gpe-theme-industrial_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-industrial_0.1.bb
@@ -1,5 +1,4 @@
 DESCRIPTION =	"GTK+ industrial theme adjusted for GPE"
-MAINTAINER =	"Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE = 	"GPL"
 PR=		"r0"
 
diff --git a/packages/gpe-themes/gpe-theme-industrial_0.2.bb b/packages/gpe-themes/gpe-theme-industrial_0.2.bb
index aaf8e4c435..79941664b8 100644
--- a/packages/gpe-themes/gpe-theme-industrial_0.2.bb
+++ b/packages/gpe-themes/gpe-theme-industrial_0.2.bb
@@ -1,5 +1,4 @@
 DESCRIPTION =	"GTK+ industrial theme adjusted for GPE"
-MAINTAINER =	"Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE =       "GPL"
 
 PR=		"r0"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.30.bb b/packages/gpe-timesheet/gpe-timesheet_0.30.bb
index ba97388877..1e995c2d81 100644
--- a/packages/gpe-timesheet/gpe-timesheet_0.30.bb
+++ b/packages/gpe-timesheet/gpe-timesheet_0.30.bb
@@ -3,7 +3,6 @@ inherit autotools gpe
 
 DESCRIPTION = "GPE time tracker"
 GPE_TARBALL_SUFFIX = "bz2"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 DEPENDS = "libgpewidget gtk+ sqlite libtododb"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.31.bb b/packages/gpe-timesheet/gpe-timesheet_0.31.bb
index ba97388877..1e995c2d81 100644
--- a/packages/gpe-timesheet/gpe-timesheet_0.31.bb
+++ b/packages/gpe-timesheet/gpe-timesheet_0.31.bb
@@ -3,7 +3,6 @@ inherit autotools gpe
 
 DESCRIPTION = "GPE time tracker"
 GPE_TARBALL_SUFFIX = "bz2"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 DEPENDS = "libgpewidget gtk+ sqlite libtododb"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
diff --git a/packages/gpe-today/gpe-today_0.11.bb b/packages/gpe-today/gpe-today_0.11.bb
index 2b02195388..c6ccf4a634 100644
--- a/packages/gpe-today/gpe-today_0.11.bb
+++ b/packages/gpe-today/gpe-today_0.11.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead"
 DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 LICENSE = "GPL"
 inherit gpe pkgconfig
diff --git a/packages/gpe-todo/gpe-todo-hildon_0.54.bb b/packages/gpe-todo/gpe-todo-hildon_0.54.bb
index 51f08a7577..8fa37565cb 100644
--- a/packages/gpe-todo/gpe-todo-hildon_0.54.bb
+++ b/packages/gpe-todo/gpe-todo-hildon_0.54.bb
@@ -3,7 +3,6 @@ PR          = "r0"
 DESCRIPTION = "GPE to-do list"
 DEPENDS     = "libgpewidget-hildon libgpepimc-hildon libtododb sdk-default-icons libosso"
 RDEPENDS    = "sdk-default-icons"
-MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 SECTION     = "gpe"
 PRIORITY    = "optional"
 
diff --git a/packages/gpe-todo/gpe-todo-hildon_0.55.bb b/packages/gpe-todo/gpe-todo-hildon_0.55.bb
index 51f08a7577..8fa37565cb 100644
--- a/packages/gpe-todo/gpe-todo-hildon_0.55.bb
+++ b/packages/gpe-todo/gpe-todo-hildon_0.55.bb
@@ -3,7 +3,6 @@ PR          = "r0"
 DESCRIPTION = "GPE to-do list"
 DEPENDS     = "libgpewidget-hildon libgpepimc-hildon libtododb sdk-default-icons libosso"
 RDEPENDS    = "sdk-default-icons"
-MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 SECTION     = "gpe"
 PRIORITY    = "optional"
 
diff --git a/packages/gpe-todo/gpe-todo.inc b/packages/gpe-todo/gpe-todo.inc
index 1009f61c44..f6218213ed 100644
--- a/packages/gpe-todo/gpe-todo.inc
+++ b/packages/gpe-todo/gpe-todo.inc
@@ -3,7 +3,6 @@ inherit gpe autotools pkgconfig
 
 DESCRIPTION = "GPE to-do list"
 DEPENDS = "libgpewidget libgpepimc libtododb"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 
diff --git a/packages/gpe-todo/gpe-todo_0.50.bb b/packages/gpe-todo/gpe-todo_0.50.bb
index 3f267c4937..6b68a442ae 100644
--- a/packages/gpe-todo/gpe-todo_0.50.bb
+++ b/packages/gpe-todo/gpe-todo_0.50.bb
@@ -3,7 +3,6 @@ inherit gpe
 
 DESCRIPTION = "GPE to-do list"
 DEPENDS = "gtk+ libdisplaymigration libgpewidget libgpepimc libtododb"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 
diff --git a/packages/gpe-todo/gpe-todo_0.51.bb b/packages/gpe-todo/gpe-todo_0.51.bb
index c93552385a..b069665d39 100644
--- a/packages/gpe-todo/gpe-todo_0.51.bb
+++ b/packages/gpe-todo/gpe-todo_0.51.bb
@@ -3,7 +3,6 @@ inherit gpe
 
 DESCRIPTION = "GPE to-do list"
 DEPENDS = "gtk+ libdisplaymigration libgpewidget libgpepimc libtododb"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 PR="r1"
diff --git a/packages/gpe-todo/gpe-todo_0.53.bb b/packages/gpe-todo/gpe-todo_0.53.bb
index c977c69c8d..7cda78c207 100644
--- a/packages/gpe-todo/gpe-todo_0.53.bb
+++ b/packages/gpe-todo/gpe-todo_0.53.bb
@@ -3,7 +3,6 @@ inherit gpe autotools pkgconfig
 
 DESCRIPTION = "GPE to-do list"
 DEPENDS = "gtk+ libgpewidget libgpepimc libtododb"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 
diff --git a/packages/gpe-what/gpe-what_0.30.bb b/packages/gpe-what/gpe-what_0.30.bb
index 7744a9d2c0..9c711a624d 100644
--- a/packages/gpe-what/gpe-what_0.30.bb
+++ b/packages/gpe-what/gpe-what_0.30.bb
@@ -4,7 +4,6 @@ inherit gpe
 
 DESCRIPTION = "GPE modal help"
 DEPENDS = "virtual/libx11"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 do_compile_prepend() {
 	rm *.d
diff --git a/packages/gpe-what/gpe-what_0.31.bb b/packages/gpe-what/gpe-what_0.31.bb
index 6d902f6a2e..362e573538 100644
--- a/packages/gpe-what/gpe-what_0.31.bb
+++ b/packages/gpe-what/gpe-what_0.31.bb
@@ -4,4 +4,3 @@ inherit gpe
 
 DESCRIPTION = "GPE modal help"
 DEPENDS = "virtual/libx11 libxpm libmatchbox"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
diff --git a/packages/gpe-what/gpe-what_0.33.bb b/packages/gpe-what/gpe-what_0.33.bb
index dcaa848124..ed7c7577ec 100644
--- a/packages/gpe-what/gpe-what_0.33.bb
+++ b/packages/gpe-what/gpe-what_0.33.bb
@@ -6,4 +6,3 @@ SRC_URI += "file://makefile-fix.patch;patch=1"
 
 DESCRIPTION = "GPE modal help"
 DEPENDS = "virtual/libx11 libxpm libmatchbox"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
diff --git a/packages/gpe-windowlist/gpe-windowlist_0.1.bb b/packages/gpe-windowlist/gpe-windowlist_0.1.bb
index 34a698a5ea..e90e4e95e9 100644
--- a/packages/gpe-windowlist/gpe-windowlist_0.1.bb
+++ b/packages/gpe-windowlist/gpe-windowlist_0.1.bb
@@ -1,7 +1,6 @@
 DEPENDS = "libgpewidget libgpelaunch gtk+"
 SECTION = "gpe"
 DESCRIPTION = "GPE windowlist applet"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE = "GPL"
 
 PR = "r0"
diff --git a/packages/gpesyncd/gpesyncd_cvs.bb b/packages/gpesyncd/gpesyncd_cvs.bb
index bafbfbb5ad..fe52b3ac95 100644
--- a/packages/gpesyncd/gpesyncd_cvs.bb
+++ b/packages/gpesyncd/gpesyncd_cvs.bb
@@ -1,6 +1,5 @@
 LICENSE =	"GPL"
 DESCRIPTION =	"Sync daemon for GPE and OpenSync"
-MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 
 SRC_URI =	"${HANDHELDS_CVS};module=gpe/base/gpesyncd"
diff --git a/packages/gpsbabel/gpsbabel_1.2.5.bb b/packages/gpsbabel/gpsbabel_1.2.5.bb
index 235e2710d9..bd7e1246ca 100644
--- a/packages/gpsbabel/gpsbabel_1.2.5.bb
+++ b/packages/gpsbabel/gpsbabel_1.2.5.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "GPS data converter"
 DEPENDS = "expat"
 HOMEPAGE = "http://gpsbabel.sf.net"
 LICENSE = "GPL"
-MAINTAINER = "Patrick Ohly <patrick.ohly@gmx.de>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gpsbabel/gpsbabel-${PV}.tar.gz"
 
diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb
index 98eee0c4fa..d16d8df590 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre2.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre2.bb
@@ -5,7 +5,6 @@ PACKAGES += "gpsdrive-add"
 DESCRIPTION = "GPS navigation/map display software"
 DEPENDS = "virtual/libc gtk+ libpcre gpsd"
 RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 SECTION = "x11"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb
index 6915bc0194..6fbba4be15 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre3.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre3.bb
@@ -7,7 +7,6 @@ PACKAGES += "gpsdrive-add"
 DESCRIPTION = "GPS navigation/map display software"
 DEPENDS = "virtual/libc gtk+ libpcre gpsd"
 RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 SECTION = "x11"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb
index 88c1fb411e..430a0f52fb 100644
--- a/packages/gpsdrive/gpsdrive_cvs.bb
+++ b/packages/gpsdrive/gpsdrive_cvs.bb
@@ -9,7 +9,6 @@ PACKAGES += "gpsdrive-add"
 DESCRIPTION = "GPS navigation/map display software"
 DEPENDS = "virtual/libc libart-lgpl gtk+ libpcre gpsd"
 RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 SECTION = "x11"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/gqview/gqview_2.1.1.bb b/packages/gqview/gqview_2.1.1.bb
index eb51955cb7..619e995771 100644
--- a/packages/gqview/gqview_2.1.1.bb
+++ b/packages/gqview/gqview_2.1.1.bb
@@ -3,7 +3,6 @@ SECTION = "x11/graphics"
 DEPENDS = "gtk+"
 LICENSE = "GPL"
 HOMEPAGE = "http://gqview.sourceforge.net/"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 RRECOMMENDS = "gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png gdk-pixbuf-loader-gif"
 PR = "r1"
 
diff --git a/packages/grep/grep_2.5.1.bb b/packages/grep/grep_2.5.1.bb
index 8f6b9b39a7..7bcabef167 100644
--- a/packages/grep/grep_2.5.1.bb
+++ b/packages/grep/grep_2.5.1.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "console/utils"
 DESCRIPTION = "grep GNU utility"
-MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2"
diff --git a/packages/grep/grep_2.5.bb b/packages/grep/grep_2.5.bb
index c71dbb09ea..6685cf70ac 100644
--- a/packages/grep/grep_2.5.bb
+++ b/packages/grep/grep_2.5.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "console/utils"
 DESCRIPTION = "grep GNU utility"
-MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 
 SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
 	   file://install.patch;patch=1"
diff --git a/packages/groff/groff_1.19.1.bb b/packages/groff/groff_1.19.1.bb
index 2560bde92b..55dcfbf8cb 100644
--- a/packages/groff/groff_1.19.1.bb
+++ b/packages/groff/groff_1.19.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "GNU roff"
 SECTION = "base"
 LICENSE = "GPL"
-MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>"
 PR = "r2"
 
 SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \
diff --git a/packages/groff/groff_1.19.2.bb b/packages/groff/groff_1.19.2.bb
index c012376c0c..1099714686 100644
--- a/packages/groff/groff_1.19.2.bb
+++ b/packages/groff/groff_1.19.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "GNU roff"
 SECTION = "base"
 LICENSE = "GPL"
-MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>"
 PR = "r3"
 
 SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \
diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc
index 54af128fb4..009eef67ed 100644
--- a/packages/gstreamer/gst-plugins.inc
+++ b/packages/gstreamer/gst-plugins.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Plugins for GStreamer"
 SECTION = "multimedia"
 PRIORITY = "optional"
-MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound-gpe"
 PR = "r1"
 
diff --git a/packages/gstreamer/gst-plugins_0.8.4.bb b/packages/gstreamer/gst-plugins_0.8.4.bb
index 0e6e1877cc..31630d9e4c 100644
--- a/packages/gstreamer/gst-plugins_0.8.4.bb
+++ b/packages/gstreamer/gst-plugins_0.8.4.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Plugins for GStreamer"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r2"
 
 DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
diff --git a/packages/gstreamer/gst-plugins_0.8.6.bb b/packages/gstreamer/gst-plugins_0.8.6.bb
index fdd29c7b2f..89de3b8939 100644
--- a/packages/gstreamer/gst-plugins_0.8.6.bb
+++ b/packages/gstreamer/gst-plugins_0.8.6.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Plugins for GStreamer"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r2"
 
 DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
diff --git a/packages/gstreamer/gst-plugins_0.8.7.bb b/packages/gstreamer/gst-plugins_0.8.7.bb
index 75bd75bd44..22b7e7dac2 100644
--- a/packages/gstreamer/gst-plugins_0.8.7.bb
+++ b/packages/gstreamer/gst-plugins_0.8.7.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Plugins for GStreamer"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r3"
 
 DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
diff --git a/packages/gstreamer/gst-plugins_0.8.8.bb b/packages/gstreamer/gst-plugins_0.8.8.bb
index cfcd5a3a2f..074522d173 100644
--- a/packages/gstreamer/gst-plugins_0.8.8.bb
+++ b/packages/gstreamer/gst-plugins_0.8.8.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Plugins for GStreamer"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gstreamer/gstreamer_0.10.4.bb b/packages/gstreamer/gstreamer_0.10.4.bb
index 435ac720b8..1b930cf5aa 100644
--- a/packages/gstreamer/gstreamer_0.10.4.bb
+++ b/packages/gstreamer/gstreamer_0.10.4.bb
@@ -4,7 +4,6 @@ SECTION = "multimedia"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
-MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 DEPENDS = "glib-2.0 gettext-native popt"
 
 PR = "r0"
diff --git a/packages/gstreamer/gstreamer_0.10.5.bb b/packages/gstreamer/gstreamer_0.10.5.bb
index 8e3a969958..3273690400 100644
--- a/packages/gstreamer/gstreamer_0.10.5.bb
+++ b/packages/gstreamer/gstreamer_0.10.5.bb
@@ -4,7 +4,6 @@ SECTION = "multimedia"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
-MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 DEPENDS = "glib-2.0 gettext-native popt"
 
 PR = "r0"
diff --git a/packages/gstreamer/gstreamer_0.10.6.bb b/packages/gstreamer/gstreamer_0.10.6.bb
index 251eb42a5d..d44630fbe2 100644
--- a/packages/gstreamer/gstreamer_0.10.6.bb
+++ b/packages/gstreamer/gstreamer_0.10.6.bb
@@ -4,7 +4,6 @@ SECTION = "multimedia"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
-MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 DEPENDS = "libxml2 glib-2.0 gettext-native popt"
 
 PR = "r0"
diff --git a/packages/gstreamer/gstreamer_0.10.8.bb b/packages/gstreamer/gstreamer_0.10.8.bb
index 251eb42a5d..d44630fbe2 100644
--- a/packages/gstreamer/gstreamer_0.10.8.bb
+++ b/packages/gstreamer/gstreamer_0.10.8.bb
@@ -4,7 +4,6 @@ SECTION = "multimedia"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
-MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 DEPENDS = "libxml2 glib-2.0 gettext-native popt"
 
 PR = "r0"
diff --git a/packages/gthumb/gthumb_2.6.9.bb b/packages/gthumb/gthumb_2.6.9.bb
index 7de4f34bb0..3a82d27eb2 100644
--- a/packages/gthumb/gthumb_2.6.9.bb
+++ b/packages/gthumb/gthumb_2.6.9.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "gThumb is an image viewer and browser for the GNOME Desktop."
 LICENSE = "GPL"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 DEPENDS = "gtk+ libexif libgnome libgnomeui libgnomeprintui"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb
index f54980f03f..56b3c0849a 100644
--- a/packages/gtk+/gtk+-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-1.2_1.2.10.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "GTK+1.2 is a deprecated library provided for running programs not
 HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
 DEPENDS = "glib-1.2 jpeg libpng libxext"
 PR = "r2"
 
diff --git a/packages/gtk+/gtk+-native-1.2_1.2.10.bb b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
index bf776494c6..232bfa4768 100644
--- a/packages/gtk+/gtk+-native-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
-MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
 DEPENDS = "glib-1.2 jpeg libpng libxext"
 PR = "r0"
 
diff --git a/packages/gtk+/gtk+_2.10.0.bb b/packages/gtk+/gtk+_2.10.0.bb
index 01110dc142..ef1f4f1d60 100644
--- a/packages/gtk+/gtk+_2.10.0.bb
+++ b/packages/gtk+/gtk+_2.10.0.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 cups"
 PR = "r3"
 
diff --git a/packages/gtk+/gtk+_2.10.1.bb b/packages/gtk+/gtk+_2.10.1.bb
index 401583987e..f4441e598c 100644
--- a/packages/gtk+/gtk+_2.10.1.bb
+++ b/packages/gtk+/gtk+_2.10.1.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 cups"
 PR = "r0"
 
diff --git a/packages/gtk+/gtk+_2.10.3.bb b/packages/gtk+/gtk+_2.10.3.bb
index 401583987e..f4441e598c 100644
--- a/packages/gtk+/gtk+_2.10.3.bb
+++ b/packages/gtk+/gtk+_2.10.3.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 cups"
 PR = "r0"
 
diff --git a/packages/gtk+/gtk+_2.2.4.bb b/packages/gtk+/gtk+_2.2.4.bb
index f54db4cdcf..eb308edca2 100644
--- a/packages/gtk+/gtk+_2.2.4.bb
+++ b/packages/gtk+/gtk+_2.2.4.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 = "pango atk jpeg libpng libxext"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.2/gtk+-${PV}.tar.bz2 \
diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb
index e32bb93a64..9fdef71c1f 100644
--- a/packages/gtk+/gtk+_2.4.13.bb
+++ b/packages/gtk+/gtk+_2.4.13.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"
 PR = "r6"
 
diff --git a/packages/gtk+/gtk+_2.4.4.bb b/packages/gtk+/gtk+_2.4.4.bb
index 7e358a16f5..1d33101b3f 100644
--- a/packages/gtk+/gtk+_2.4.4.bb
+++ b/packages/gtk+/gtk+_2.4.4.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"
 PR = "r7"
 
diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb
index e9e6db921b..b8b65d3351 100644
--- a/packages/gtk+/gtk+_2.6.10.bb
+++ b/packages/gtk+/gtk+_2.6.10.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"
 PR = "r2"
 
diff --git a/packages/gtk+/gtk+_2.6.3.bb b/packages/gtk+/gtk+_2.6.3.bb
index 38263836b9..4643eb557d 100644
--- a/packages/gtk+/gtk+_2.6.3.bb
+++ b/packages/gtk+/gtk+_2.6.3.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"
 PR = "r1"
 
diff --git a/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/packages/gtk+/gtk+_2.6.4-1.osso7.bb
index 774c2eb8d4..6a6d560a50 100644
--- a/packages/gtk+/gtk+_2.6.4-1.osso7.bb
+++ b/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@linuxtogo.org>"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
 PR = "r1"
 
diff --git a/packages/gtk+/gtk+_2.8.16.bb b/packages/gtk+/gtk+_2.8.16.bb
index d870b0e0b1..e4ac0617a0 100644
--- a/packages/gtk+/gtk+_2.8.16.bb
+++ b/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/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
index 34e1212694..b3bf0b6c59 100644
--- a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
+++ b/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/packages/gtk-engines/gtk-engines_2.2.0.bb b/packages/gtk-engines/gtk-engines_2.2.0.bb
index 97f26b288c..5572568f61 100644
--- a/packages/gtk-engines/gtk-engines_2.2.0.bb
+++ b/packages/gtk-engines/gtk-engines_2.2.0.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/base"
 DESCRIPTION = "GTK theme engines"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+"
 
 PACKAGES += " gtk-engine-pixmap gtk-engine-redmond95 gtk-engine-metal gtk-theme-metal gtk-theme-redmond95"
diff --git a/packages/gtk-engines/gtk-engines_2.6.1.bb b/packages/gtk-engines/gtk-engines_2.6.1.bb
index add0cd912d..6e192d78fd 100644
--- a/packages/gtk-engines/gtk-engines_2.6.1.bb
+++ b/packages/gtk-engines/gtk-engines_2.6.1.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/base"
 DESCRIPTION = "GTK theme engines"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+"
 
 RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
diff --git a/packages/gtk-engines/gtk-engines_2.6.3.bb b/packages/gtk-engines/gtk-engines_2.6.3.bb
index add0cd912d..6e192d78fd 100644
--- a/packages/gtk-engines/gtk-engines_2.6.3.bb
+++ b/packages/gtk-engines/gtk-engines_2.6.3.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/base"
 DESCRIPTION = "GTK theme engines"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+"
 
 RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
diff --git a/packages/gtk-engines/gtk-engines_2.6.5.bb b/packages/gtk-engines/gtk-engines_2.6.5.bb
index add0cd912d..6e192d78fd 100644
--- a/packages/gtk-engines/gtk-engines_2.6.5.bb
+++ b/packages/gtk-engines/gtk-engines_2.6.5.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/base"
 DESCRIPTION = "GTK theme engines"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+"
 
 RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
diff --git a/packages/gtk-engines/gtk-engines_2.7.4.bb b/packages/gtk-engines/gtk-engines_2.7.4.bb
index c6a94549d5..29c20e1e65 100644
--- a/packages/gtk-engines/gtk-engines_2.7.4.bb
+++ b/packages/gtk-engines/gtk-engines_2.7.4.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/base"
 DESCRIPTION = "GTK theme engines"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "gtk+ cairo"
 
 RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.36.2.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.36.2.bb
index 78700b91a2..68a5119aa1 100644
--- a/packages/gtk-engines/gtk-industrial-engine_0.2.36.2.bb
+++ b/packages/gtk-engines/gtk-industrial-engine_0.2.36.2.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/base"
 DESCRIPTION = "Industrial theme engine for GTK"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL2"
 DEPENDS = "gtk+"
 
diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.36.4.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.36.4.bb
index 78700b91a2..68a5119aa1 100644
--- a/packages/gtk-engines/gtk-industrial-engine_0.2.36.4.bb
+++ b/packages/gtk-engines/gtk-industrial-engine_0.2.36.4.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/base"
 DESCRIPTION = "Industrial theme engine for GTK"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL2"
 DEPENDS = "gtk+"
 
diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.36.5.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.36.5.bb
index 78700b91a2..68a5119aa1 100644
--- a/packages/gtk-engines/gtk-industrial-engine_0.2.36.5.bb
+++ b/packages/gtk-engines/gtk-industrial-engine_0.2.36.5.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/base"
 DESCRIPTION = "Industrial theme engine for GTK"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL2"
 DEPENDS = "gtk+"
 
diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
index 78700b91a2..68a5119aa1 100644
--- a/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
+++ b/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/base"
 DESCRIPTION = "Industrial theme engine for GTK"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL2"
 DEPENDS = "gtk+"
 
diff --git a/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb b/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb
index c0d8f2d8d7..95a8d87d9c 100644
--- a/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb
+++ b/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb
@@ -2,7 +2,6 @@ PR = "r0"
 LICENSE = "LGPL"
 SECTION = "x11/base"
 DESCRIPTION = "GTK theme engine Smooth"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 DEPENDS = "gtk+"
 
 FILES_${PN} = "${libdir}/gtk-2.0/2.4.0/engines/libsmooth.so"
diff --git a/packages/gtk-webcore/osb-browser_0.5.0.bb b/packages/gtk-webcore/osb-browser_0.5.0.bb
index 93821ccb7f..a401de6129 100644
--- a/packages/gtk-webcore/osb-browser_0.5.0.bb
+++ b/packages/gtk-webcore/osb-browser_0.5.0.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Gtk+ WebCore - reference browser"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade"
 SECTION = "gpe"
 
diff --git a/packages/gtk-webcore/osb-browser_20050430.bb b/packages/gtk-webcore/osb-browser_20050430.bb
index 4a66420d3c..749698eba5 100644
--- a/packages/gtk-webcore/osb-browser_20050430.bb
+++ b/packages/gtk-webcore/osb-browser_20050430.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Gtk+ WebCore - reference browser"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
diff --git a/packages/gtk-webcore/osb-browser_20060212.bb b/packages/gtk-webcore/osb-browser_20060212.bb
index a5260c8432..608b3ec014 100644
--- a/packages/gtk-webcore/osb-browser_20060212.bb
+++ b/packages/gtk-webcore/osb-browser_20060212.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Gtk+ WebCore - reference browser"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
diff --git a/packages/gtk-webcore/osb-jscore_0.5.0.bb b/packages/gtk-webcore/osb-jscore_0.5.0.bb
index c5d2fc4e9e..6f4f3df5b7 100644
--- a/packages/gtk-webcore/osb-jscore_0.5.0.bb
+++ b/packages/gtk-webcore/osb-jscore_0.5.0.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Gtk+ WebCore - JavaScriptCore"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 PR = "r3"
 
diff --git a/packages/gtk-webcore/osb-jscore_20050430.bb b/packages/gtk-webcore/osb-jscore_20050430.bb
index 22be1b1237..ce97046c84 100644
--- a/packages/gtk-webcore/osb-jscore_20050430.bb
+++ b/packages/gtk-webcore/osb-jscore_20050430.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Gtk+ WebCore - JavaScriptCore"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
diff --git a/packages/gtk-webcore/osb-jscore_20060212.bb b/packages/gtk-webcore/osb-jscore_20060212.bb
index 99bf8c63f7..6900dc392a 100644
--- a/packages/gtk-webcore/osb-jscore_20060212.bb
+++ b/packages/gtk-webcore/osb-jscore_20060212.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Gtk+ WebCore - JavaScriptCore"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
diff --git a/packages/gtk-webcore/osb-nrcit_0.5.0.bb b/packages/gtk-webcore/osb-nrcit_0.5.0.bb
index aadca65d45..34607b02c4 100644
--- a/packages/gtk-webcore/osb-nrcit_0.5.0.bb
+++ b/packages/gtk-webcore/osb-nrcit_0.5.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Gtk+ WebCore - NRCit embeddable browser component"
 LICENSE = "nokia"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 DEPENDS = "curl osb-nrcore"
 SECTION = "gpe"
 PR = "r2"
diff --git a/packages/gtk-webcore/osb-nrcit_20050430.bb b/packages/gtk-webcore/osb-nrcit_20050430.bb
index da3b7a8fd9..1b9183a492 100644
--- a/packages/gtk-webcore/osb-nrcit_20050430.bb
+++ b/packages/gtk-webcore/osb-nrcit_20050430.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Gtk+ WebCore - NRCit embeddable browser component"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 LICENSE = "nokia"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
diff --git a/packages/gtk-webcore/osb-nrcit_20060212.bb b/packages/gtk-webcore/osb-nrcit_20060212.bb
index 5dee1c29a0..7449d0d845 100644
--- a/packages/gtk-webcore/osb-nrcit_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcit_20060212.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Gtk+ WebCore - NRCit embeddable browser component"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 LICENSE = "nokia"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
diff --git a/packages/gtk-webcore/osb-nrcore_0.5.0.bb b/packages/gtk-webcore/osb-nrcore_0.5.0.bb
index ec9e1067c5..34bafd659b 100644
--- a/packages/gtk-webcore/osb-nrcore_0.5.0.bb
+++ b/packages/gtk-webcore/osb-nrcore_0.5.0.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Gtk+ WebCore - rendering engine"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 DEPENDS = "glib-2.0 gtk+ pango osb-jscore"
 SECTION = "gpe"
 PR = "r2"
diff --git a/packages/gtk-webcore/osb-nrcore_20050430.bb b/packages/gtk-webcore/osb-nrcore_20050430.bb
index ed7544b4cd..bc4ca5c435 100644
--- a/packages/gtk-webcore/osb-nrcore_20050430.bb
+++ b/packages/gtk-webcore/osb-nrcore_20050430.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Gtk+ WebCore - rendering engine"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
diff --git a/packages/gtk-webcore/osb-nrcore_20060212.bb b/packages/gtk-webcore/osb-nrcore_20060212.bb
index 06bd5fdf1c..bdcbda0877 100644
--- a/packages/gtk-webcore/osb-nrcore_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcore_20060212.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Gtk+ WebCore - rendering engine"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
diff --git a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
index 59fd90d716..aaa4b3301c 100644
--- a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
+++ b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 SECTION = "x11/libs"
 DESCRIPTION = "HTML rendering/editing library"
 DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PR = "r0"
 
 inherit gnome
diff --git a/packages/gtkhtml2/gtkhtml2_cvs.bb b/packages/gtkhtml2/gtkhtml2_cvs.bb
index 01360b2077..c44a7ee5f0 100644
--- a/packages/gtkhtml2/gtkhtml2_cvs.bb
+++ b/packages/gtkhtml2/gtkhtml2_cvs.bb
@@ -2,7 +2,6 @@ SECTION = "libs"
 DEPENDS = "gtk+ glib-2.0 libxml2"
 DESCRIPTION = "A GTK+ HTML rendering library."
 LICENSE = "GPL"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
 PV = "2.11.0+cvs${SRCDATE}"
 PR = "r3"
 
diff --git a/packages/gtkmm/gtkmm_2.4.8.bb b/packages/gtkmm/gtkmm_2.4.8.bb
index 75c47dcfe2..c16dde33b0 100644
--- a/packages/gtkmm/gtkmm_2.4.8.bb
+++ b/packages/gtkmm/gtkmm_2.4.8.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "C++ bindings for the GTK+ toolkit."
 HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>"
 DEPENDS = "glibmm"
 PR = "r0"
 
diff --git a/packages/guile/guile-native_1.6.4.bb b/packages/guile/guile-native_1.6.4.bb
index 9457d054b0..96763730ec 100644
--- a/packages/guile/guile-native_1.6.4.bb
+++ b/packages/guile/guile-native_1.6.4.bb
@@ -1,6 +1,5 @@
 SECTION = "unknown"
 LICENSE = "GPL"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
 	   file://guile-amd64.patch;patch=1"
 
diff --git a/packages/guile/guile_1.6.4.bb b/packages/guile/guile_1.6.4.bb
index 389aec9489..092a44c27d 100644
--- a/packages/guile/guile_1.6.4.bb
+++ b/packages/guile/guile_1.6.4.bb
@@ -3,7 +3,6 @@ packaged as a library which can be incorporated into your programs."
 HOMEPAGE = "http://www.gnu.org/software/guile/guile.html"
 SECTION = "devel/scheme"
 DEPENDS = "guile-native"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/gxine/gxine_0.4.1.bb b/packages/gxine/gxine_0.4.1.bb
index b171d1e9a9..7f2bfedf3b 100644
--- a/packages/gxine/gxine_0.4.1.bb
+++ b/packages/gxine/gxine_0.4.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "gxine is a front-end for libxine."
 SECTION = "x11/multimedia"
 LICENSE = "GPL"
-MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 DEPENDS = "gtk+ libxine-x11"
 PR = "r2"
 
diff --git a/packages/gxine/gxine_0.4.1enhanced.bb b/packages/gxine/gxine_0.4.1enhanced.bb
index 189eccdd02..ee0d50126b 100644
--- a/packages/gxine/gxine_0.4.1enhanced.bb
+++ b/packages/gxine/gxine_0.4.1enhanced.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "gxine is a front-end for libxine."
 SECTION = "x11/multimedia"
 LICENSE = "GPL"
-MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 DEPENDS = "gtk+ libxine-x11"
 PR = "r1"
 
diff --git a/packages/gzip/gzip_1.3.5.bb b/packages/gzip/gzip_1.3.5.bb
index a138221367..a0c49864b4 100644
--- a/packages/gzip/gzip_1.3.5.bb
+++ b/packages/gzip/gzip_1.3.5.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "console/utils"
 PRIORITY = "required"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "gzip (GNU zip) is a compression utility designed \
 to be a replacement for 'compress'. The GNU Project uses it as \
 the standard compression program for its system."
diff --git a/packages/h2200-bootloader/h2200-bootloader.bb b/packages/h2200-bootloader/h2200-bootloader.bb
index 376e34d7cc..dc7c2277a8 100644
--- a/packages/h2200-bootloader/h2200-bootloader.bb
+++ b/packages/h2200-bootloader/h2200-bootloader.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Bootloader firmware extractor for the h2200 iPAQ"
 ALLOW_EMPTY = "1"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PR="r2"
 
 COMPATIBLE_MACHINE = "h2200"
diff --git a/packages/hal/hal_0.2.98.bb b/packages/hal/hal_0.2.98.bb
index 6037f2ad8e..7c8b8b73eb 100644
--- a/packages/hal/hal_0.2.98.bb
+++ b/packages/hal/hal_0.2.98.bb
@@ -1,6 +1,5 @@
 SECTION = "unknown"
 DESCRIPTION = "Hardware Abstraction Layer"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "dbus expat"
 RDEPENDS += "hotplug"
 HOMEPAGE = "http://freedesktop.org/Software/hal"
diff --git a/packages/hal/hal_0.5.2.bb b/packages/hal/hal_0.5.2.bb
index d02970ed1d..fd29980e56 100644
--- a/packages/hal/hal_0.5.2.bb
+++ b/packages/hal/hal_0.5.2.bb
@@ -1,6 +1,5 @@
 SECTION = "unknown"
 DESCRIPTION = "Hardware Abstraction Layer"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "dbus expat"
 RDEPENDS += "hotplug"
 RRECOMMENDS = "udev-utils"
diff --git a/packages/hal/hal_0.5.4.bb b/packages/hal/hal_0.5.4.bb
index 3d439b79d9..147439d4c3 100644
--- a/packages/hal/hal_0.5.4.bb
+++ b/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/packages/hal/hal_0.5.7.bb b/packages/hal/hal_0.5.7.bb
index 3361efc6b2..5476e2ec22 100644
--- a/packages/hal/hal_0.5.7.bb
+++ b/packages/hal/hal_0.5.7.bb
@@ -1,6 +1,5 @@
 SECTION = "unknown"
 DESCRIPTION = "Hardware Abstraction Layer"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "dbus expat libusb"
 RDEPENDS += "hotplug"
 RDEPENDS_hal-device-manager = "python hal python-pygnome"
diff --git a/packages/hibernate-script/hibernate-script_1.12.bb b/packages/hibernate-script/hibernate-script_1.12.bb
index 07b47210d5..e5c912d3d9 100644
--- a/packages/hibernate-script/hibernate-script_1.12.bb
+++ b/packages/hibernate-script/hibernate-script_1.12.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION="Hibernate script supporting multiple suspend methods"
 LICENSE="GPL"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 HOMEPAGE="http://www.suspend2.net"
 
 SRC_URI="http://www.suspend2.net/downloads/all/${PN}-${PV}.tar.gz \
diff --git a/packages/hnb/hnb_1.9.17+1.9.18pre7.bb b/packages/hnb/hnb_1.9.17+1.9.18pre7.bb
index b907665bc8..70d3528d5c 100644
--- a/packages/hnb/hnb_1.9.17+1.9.18pre7.bb
+++ b/packages/hnb/hnb_1.9.17+1.9.18pre7.bb
@@ -3,7 +3,6 @@ SECTION = "console/pim"
 HOMEPAGE = "http://hnb.sf.net"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "http://hnb.sourceforge.net/.files/hnb-1.9.18.pre7.tar.gz"
 S = "${WORKDIR}/hnb-1.9.18.pre7"
diff --git a/packages/hostap/hostap-conf_1.0.bb b/packages/hostap/hostap-conf_1.0.bb
index 7f407e8f9a..b95b3dd2c4 100644
--- a/packages/hostap/hostap-conf_1.0.bb
+++ b/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/packages/hostap/hostap-daemon.inc b/packages/hostap/hostap-daemon.inc
index c095777446..08a6dba1f7 100644
--- a/packages/hostap/hostap-daemon.inc
+++ b/packages/hostap/hostap-daemon.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
 HOMEPAGE = "http://hostap.epitest.fi"
 SECTION = "kernel/userland"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "hostap-modules hostap-utils (${PV})"
 DEPENDS = "openssl"
diff --git a/packages/hostap/hostap-modules.inc b/packages/hostap/hostap-modules.inc
index 4d1cc76d32..9a928210c6 100644
--- a/packages/hostap/hostap-modules.inc
+++ b/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/packages/hostap/hostap-utils.inc b/packages/hostap/hostap-utils.inc
index 1e4362d0f7..c039aba9dc 100644
--- a/packages/hostap/hostap-utils.inc
+++ b/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/packages/hotplug-dbus/hotplug-dbus_0.9.bb b/packages/hotplug-dbus/hotplug-dbus_0.9.bb
index 47abb12200..60cb39cd51 100644
--- a/packages/hotplug-dbus/hotplug-dbus_0.9.bb
+++ b/packages/hotplug-dbus/hotplug-dbus_0.9.bb
@@ -3,7 +3,6 @@ SECTION = "base"
 DESCRIPTION = "D-BUS glue for hotplug system"
 # DEPENDS = "dbus hotplug"
 DEPENDS = "dbus"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 RDEPENDS = "hotplug"
 LICENSE = "GPL"
 
diff --git a/packages/hotplug-ng/hotplug-ng_001.bb b/packages/hotplug-ng/hotplug-ng_001.bb
index f287893fa9..2a10df6886 100644
--- a/packages/hotplug-ng/hotplug-ng_001.bb
+++ b/packages/hotplug-ng/hotplug-ng_001.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "This collection of code replaces the existing linux-hotplug \
 package with very tiny, compiled executable programs, instead of the \
 existing bash scripts."
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 RPROVIDES = "hotplug"
 RCONFLICTS = "hotplug"
 RREPLACES = "hotplug"
diff --git a/packages/hotplug-qcop/hotplug-qcop_cvs.bb b/packages/hotplug-qcop/hotplug-qcop_cvs.bb
index 711b9a6f8d..f8692f352f 100644
--- a/packages/hotplug-qcop/hotplug-qcop_cvs.bb
+++ b/packages/hotplug-qcop/hotplug-qcop_cvs.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "HotPlug -> QCOP Event Bridge"
 SECTION = "opie/base"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 RDEPENDS = "opie-qcop hotplug"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/hping/hping2_1.9.9+2.0.0rc3.bb b/packages/hping/hping2_1.9.9+2.0.0rc3.bb
index cedcf975f9..722d3a4425 100644
--- a/packages/hping/hping2_1.9.9+2.0.0rc3.bb
+++ b/packages/hping/hping2_1.9.9+2.0.0rc3.bb
@@ -6,7 +6,6 @@ mode, the ability to send files between a covered channel, and many \
 other features."
 HOMEPAGE = "http://www.hping.org/"
 SECTION = "console/network"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/htb-init/htb-init_0.8.5.bb b/packages/htb-init/htb-init_0.8.5.bb
index c7fdbed80f..a70da77746 100644
--- a/packages/htb-init/htb-init_0.8.5.bb
+++ b/packages/htb-init/htb-init_0.8.5.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "HTB.init is a shell script that allows for easy setup of HTB-based traffic control on Linux."
 HOMEPAGE = "http://sourceforge.net/projects/htbinit"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/htun/htun_0.9.5.bb b/packages/htun/htun_0.9.5.bb
index 611cead1e1..5495ec5799 100644
--- a/packages/htun/htun_0.9.5.bb
+++ b/packages/htun/htun_0.9.5.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Http tunnelling daemon"
 SECTION = "network"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://htun.runslinux.net"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/hvsc/hvsc_5.8.bb b/packages/hvsc/hvsc_5.8.bb
index 027eb13c7f..45d212fe07 100644
--- a/packages/hvsc/hvsc_5.8.bb
+++ b/packages/hvsc/hvsc_5.8.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "The High Voltage SID Collection (HVSC) \
 Commodore 64 music for the masses"
 LICENSE = "PD"
 SECTION = "multimedia"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "http://gallium.prg.dtu.dk/HVSC/random/HVSC_${PV}-all-of-them.zip"
 S = "${WORKDIR}"
diff --git a/packages/iaimaster/iaimaster_0.5.bb b/packages/iaimaster/iaimaster_0.5.bb
index 371b39924a..e86cf361b4 100644
--- a/packages/iaimaster/iaimaster_0.5.bb
+++ b/packages/iaimaster/iaimaster_0.5.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Pen action mini game. You fight evil Iai-Master and must survive. \
 (Iai is a kind of the samurai fighting style)"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "opie/games"
 LICENSE = "GPL"
 APPNAME = "${PN}"
diff --git a/packages/ica/ica-bin_8.0.bb b/packages/ica/ica-bin_8.0.bb
index 1cd2c39289..8ed18620b2 100644
--- a/packages/ica/ica-bin_8.0.bb
+++ b/packages/ica/ica-bin_8.0.bb
@@ -4,7 +4,6 @@
 
 DEPENDS = "virtual/libx11 libxaw rpm2cpio-native"
 
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 HOMEPAGE="www.citrix.com/download/"
 
 SRC_URI="file://${DL_DIR}/ICAClient-8.0-1.i386.rpm" 
diff --git a/packages/icmpquery/icmpquery.bb b/packages/icmpquery/icmpquery.bb
index ca69f07c28..8821432b3b 100644
--- a/packages/icmpquery/icmpquery.bb
+++ b/packages/icmpquery/icmpquery.bb
@@ -1,6 +1,5 @@
 SECTION = "network/misc"
 DESCRIPTION = "IMCP query generator"
-MAINTAINER = "Bob Davies (tyggerbob@gmail.com)"
 SRC_URI = "file://icmpquery.c \
 	   file://Makefile"
 PV = "1.03"
diff --git a/packages/id3lib/id3lib_3.8.3.bb b/packages/id3lib/id3lib_3.8.3.bb
index 6062b2711e..d63106230a 100644
--- a/packages/id3lib/id3lib_3.8.3.bb
+++ b/packages/id3lib/id3lib_3.8.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Library for interacting with ID3 tags."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "jason haslup <openembedded@haslup.com>"
 DEPENDS = "zlib"
 DESCRIPTION = "Library for interacting with ID3 tags."
 LICENSE = "GPL"
diff --git a/packages/images/essential-image.bb b/packages/images/essential-image.bb
index 53510ddc09..2388a0e3f7 100644
--- a/packages/images/essential-image.bb
+++ b/packages/images/essential-image.bb
@@ -6,7 +6,6 @@
 # Date: 23-Apr-06
 
 DESCRIPTION = "<description>"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 
 ######################################################################################
diff --git a/packages/images/essential-machine-image.bb b/packages/images/essential-machine-image.bb
index c3c7b33b92..04f74aacf5 100644
--- a/packages/images/essential-machine-image.bb
+++ b/packages/images/essential-machine-image.bb
@@ -6,7 +6,6 @@
 # Date: 24-Apr-06
 
 DESCRIPTION = "<description>"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 
 ######################################################################################
diff --git a/packages/images/gpe-image-blank-user.bb b/packages/images/gpe-image-blank-user.bb
index 60e78ba414..d092d3c44a 100644
--- a/packages/images/gpe-image-blank-user.bb
+++ b/packages/images/gpe-image-blank-user.bb
@@ -1,6 +1,5 @@
 require gpe-image.bb
 
-MAINTAINER = "Rob Taylor <rjt@cambridgebroadband.com"
 
 PR = "r5"
 
diff --git a/packages/images/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb
index 1ddd022d08..3c4690774a 100644
--- a/packages/images/sectest-gpe-image.bb
+++ b/packages/images/sectest-gpe-image.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Bob Davies  <tyggerbob@rogers.com>"
 LICENSE = MIT
 PR = "r6"
 
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 34ca424821..7073105e24 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -4,7 +4,6 @@
 # conf/distro/slugos.conf to get the standard settings).
 #
 DESCRIPTION = "Generic SlugOS image"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
 PR = "r36"
diff --git a/packages/images/slugos-imagename.bb b/packages/images/slugos-imagename.bb
index 2637524407..01cca8a0c3 100644
--- a/packages/images/slugos-imagename.bb
+++ b/packages/images/slugos-imagename.bb
@@ -1,6 +1,5 @@
 # This is an inglorious hack to provide a package to match
 # ${SLUGOS_IMAGENAME}-image
-MAINTAINER = "John Bowler <jbowler@acm.org>
 LICENSE = "MIT"
 PN = "${SLUGOS_IMAGENAME}-image"
 PV = "0"
diff --git a/packages/images/uml-image.bb b/packages/images/uml-image.bb
index 5b6981488e..e1b76dfc57 100644
--- a/packages/images/uml-image.bb
+++ b/packages/images/uml-image.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "A rootfs for User-Mode-Linux"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 export IMAGE_BASENAME = "uml-image"
 
diff --git a/packages/imposter/imposter_0.3.bb b/packages/imposter/imposter_0.3.bb
index 27a8131d2c..209dd93220 100644
--- a/packages/imposter/imposter_0.3.bb
+++ b/packages/imposter/imposter_0.3.bb
@@ -1,6 +1,5 @@
 DESCRIPTION =	"Imposter is a standalone viewer for the presentations created by OpenOffice.org Impress software."
 LICENSE =	"GPLv2"
-MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 SRC_URI	=	"${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
 DEPENDS =	"gtk+"
diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb
index 4fb6926490..b73eed2b20 100644
--- a/packages/initscripts/initscripts-slugos_1.0.bb
+++ b/packages/initscripts/initscripts-slugos_1.0.bb
@@ -6,7 +6,6 @@
 # in.
 include initscripts_${PV}.bb
 
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 RCONFLICTS = "initscripts"
 # All other standard definitions inherited from initscripts
 # Except the PR which is hacked here.  The format used is
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 9cf7e47de0..c1224b196a 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/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/packages/inkscape/inkscape_0.38.1.bb b/packages/inkscape/inkscape_0.38.1.bb
index 71f6fa5032..34416b06ed 100644
--- a/packages/inkscape/inkscape_0.38.1.bb
+++ b/packages/inkscape/inkscape_0.38.1.bb
@@ -2,7 +2,6 @@ SECTION = "x11/utils"
 DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
 blending, node editing, SVG to PNG export, and more. Its goal is for features \
 similar to Illustrator, CorelDraw, Visio, etc."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "intltool-native gtk+ libart-lgpl libxml2 libsigc++-1.2 popt"
 LICENSE = "GPL"
 
diff --git a/packages/inkscape/inkscape_0.39.bb b/packages/inkscape/inkscape_0.39.bb
index 71f6fa5032..34416b06ed 100644
--- a/packages/inkscape/inkscape_0.39.bb
+++ b/packages/inkscape/inkscape_0.39.bb
@@ -2,7 +2,6 @@ SECTION = "x11/utils"
 DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
 blending, node editing, SVG to PNG export, and more. Its goal is for features \
 similar to Illustrator, CorelDraw, Visio, etc."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "intltool-native gtk+ libart-lgpl libxml2 libsigc++-1.2 popt"
 LICENSE = "GPL"
 
diff --git a/packages/inkscape/inkscape_0.42.bb b/packages/inkscape/inkscape_0.42.bb
index 64bf17e10a..301666537b 100644
--- a/packages/inkscape/inkscape_0.42.bb
+++ b/packages/inkscape/inkscape_0.42.bb
@@ -4,7 +4,6 @@ SECTION = "x11/utils"
 DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
 blending, node editing, SVG to PNG export, and more. Its goal is for features \
 similar to Illustrator, CorelDraw, Visio, etc."
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libgc intltool-native gtk+ gtkmm glibmm libart-lgpl libxslt librsvg libxml2 libsigc++-1.2 popt"
 LICENSE = "GPL"
 
diff --git a/packages/inkscape/inkscape_0.43.bb b/packages/inkscape/inkscape_0.43.bb
index f813b70afb..6851b491c2 100644
--- a/packages/inkscape/inkscape_0.43.bb
+++ b/packages/inkscape/inkscape_0.43.bb
@@ -2,7 +2,6 @@ SECTION = "x11/utils"
 DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
 blending, node editing, SVG to PNG export, and more. Its goal is for features \
 similar to Illustrator, CorelDraw, Visio, etc."
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libgc intltool-native gtk+ gtkmm glibmm libart-lgpl libxslt librsvg libxml2 libsigc++-1.2 popt"
 LICENSE = "GPL"
 
diff --git a/packages/inkwp/inkwp_0.1.1.bb b/packages/inkwp/inkwp_0.1.1.bb
index 9d7e25ad03..f1fb02ea23 100644
--- a/packages/inkwp/inkwp_0.1.1.bb
+++ b/packages/inkwp/inkwp_0.1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Inkwp - a handwriting note take application for Qt/Embedded based palmtop environments."
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.geocities.co.jp/SiliconValley-Oakland/4550/inkwp.html"
 
diff --git a/packages/inotify-tools/inotify-tools_2.1.bb b/packages/inotify-tools/inotify-tools_2.1.bb
index 2f4fdd025a..0808ee964f 100644
--- a/packages/inotify-tools/inotify-tools_2.1.bb
+++ b/packages/inotify-tools/inotify-tools_2.1.bb
@@ -3,7 +3,6 @@ Linux inotify filesystem change notification system."
 LICENSE = "GPL"
 AUTHOR = "Rohan McGovern"
 HOMEPAGE = "http://rohanpm.net/inotify-tools"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 
 SRC_URI = "http://rohanpm.net/files/inotify-tools-2.1.tar.gz"
diff --git a/packages/inputpipe/inputpipe_svn.bb b/packages/inputpipe/inputpipe_svn.bb
index ffa59a762a..3274e9a5eb 100644
--- a/packages/inputpipe/inputpipe_svn.bb
+++ b/packages/inputpipe/inputpipe_svn.bb
@@ -1,7 +1,6 @@
 SECTION = "base"
 PRIORITY = "optional"
 DESCRIPTION = "Inputpipe is a network transparency layer for linux input devices"
-MAINTAINER = "Micah Dowty <micah@navi.cx>"
 LICENSE = "GPL"
 #Remove the dash below when 0.5 changes in PV
 PV = "0.5+svn-${SRCDATE}"
diff --git a/packages/install/install-native_0.1.bb b/packages/install/install-native_0.1.bb
index b912b2b65e..059342e920 100644
--- a/packages/install/install-native_0.1.bb
+++ b/packages/install/install-native_0.1.bb
@@ -1,7 +1,6 @@
 # This package uses the GNU autotools install-sh script to implement
 # a target-capable 'install' command.
 DESCRIPTION = "Target install command"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "MIT"
diff --git a/packages/intltool/intltool_0.30.bb b/packages/intltool/intltool_0.30.bb
index 1fdc1bef20..f1660e7262 100644
--- a/packages/intltool/intltool_0.30.bb
+++ b/packages/intltool/intltool_0.30.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/packages/intltool/intltool_0.31.bb b/packages/intltool/intltool_0.31.bb
index 1fdc1bef20..f1660e7262 100644
--- a/packages/intltool/intltool_0.31.bb
+++ b/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/packages/ion/ion3_0.0+ds20041104.bb b/packages/ion/ion3_0.0+ds20041104.bb
index 432da1b629..27742e0670 100644
--- a/packages/ion/ion3_0.0+ds20041104.bb
+++ b/packages/ion/ion3_0.0+ds20041104.bb
@@ -6,7 +6,6 @@ DESCRIPTION = "Ion is a tiling tabbed window manager designed with keyboard \
 users in mind."
 HOMEPAGE = "http://modeemi.fi/~tuomov/ion/"
 LICENSE = "LGPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PROVIDES += "ion"
 SECTION = "x11/wm"
 SNAPDATE = "${@(bb.data.getVar('PV', d, 1) or '')[-8:]}"
diff --git a/packages/ipac-ng/ipac-ng_1.30.bb b/packages/ipac-ng/ipac-ng_1.30.bb
index 2c22353358..3315c44ae7 100644
--- a/packages/ipac-ng/ipac-ng_1.30.bb
+++ b/packages/ipac-ng/ipac-ng_1.30.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "IPAC-NG is the iptables/ipchains based IP accounting package for Linux"
 HOMEPAGE = "http://ipac-ng.sourceforge.net/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 SRC_URI = "${SOURCEFORGE_MIRROR}/ipac-ng/ipac-ng-${PV}.tar.bz2 \
 	file://makefile-build-cc.diff;patch=1;pnum=0"
 RDEPENDS = "perl libgd-perl"
diff --git a/packages/iperf/iperf_1.7.0.bb b/packages/iperf/iperf_1.7.0.bb
index cca0d78fec..1a5fec48d3 100644
--- a/packages/iperf/iperf_1.7.0.bb
+++ b/packages/iperf/iperf_1.7.0.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics"
 HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/"
 LICENSE = "BSD"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 PR = "r1"
 
 SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \
diff --git a/packages/ipsec-tools/ipsec-tools.inc b/packages/ipsec-tools/ipsec-tools.inc
index 31ec6c87bf..a6fa2efb28 100644
--- a/packages/ipsec-tools/ipsec-tools.inc
+++ b/packages/ipsec-tools/ipsec-tools.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "IPsec-Tools is a port of KAME's IPsec utilities to the \
 Linux-2.6 IPsec implementation."
 DEPENDS = "virtual/kernel openssl readline flex"
 LICENSE = "BSD"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/network"
 PR = "r1"
 
diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb
index 2cd5c92e25..2b82b853f1 100644
--- a/packages/iputils/iputils_20020927.bb
+++ b/packages/iputils/iputils_20020927.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \
 tracepath, tracepath6, ping, ping6 and arping."
 SECTION = "console/network"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE ="BSD"
 PR = "r4"
 
diff --git a/packages/iqnotes/iqnotes.inc b/packages/iqnotes/iqnotes.inc
index e6568833cf..f26e8cce9e 100644
--- a/packages/iqnotes/iqnotes.inc
+++ b/packages/iqnotes/iqnotes.inc
@@ -5,7 +5,6 @@ Data can be crypted by strong AES algorithm."
 SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 HOMEPAGE = "http://iqnotes.berlios.de"
 AUTHOR = "Peter Vrabel <kybu@kybu.org>"
 
diff --git a/packages/irssi/irssi_0.8.10.bb b/packages/irssi/irssi_0.8.10.bb
index 52e318337a..729c756e47 100644
--- a/packages/irssi/irssi_0.8.10.bb
+++ b/packages/irssi/irssi_0.8.10.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Irssi is a modular IRC client with Perl scripting."
 HOMEPAGE = "http://irssi.org/"
 SECTION = "console/network"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS += "ncurses glib-1.2"
 PR = "r0"
 
diff --git a/packages/irssi/irssi_svn.bb b/packages/irssi/irssi_svn.bb
index ab37908a27..1fe2619ca1 100644
--- a/packages/irssi/irssi_svn.bb
+++ b/packages/irssi/irssi_svn.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Irssi is a modular IRC client with Perl scripting."
 HOMEPAGE = "http://irssi.org/"
 SECTION = "console/network"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS += "ncurses glib-1.2"
 PV = "0.8.10+svn${SRCDATE}"
 PR = "r2"
diff --git a/packages/irssi/xirssi_cvs.bb b/packages/irssi/xirssi_cvs.bb
index 0f19cc3746..e6c0057fb9 100644
--- a/packages/irssi/xirssi_cvs.bb
+++ b/packages/irssi/xirssi_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Xirssi is an X frontend to the modular IRC client irssi."
 HOMEPAGE = "http://irssi.org/"
 SECTION = "x11/network"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS += "irssi gtk+"
 RDEPENDS_${PN} += "irssi-common"
 PV = "0.0+cvs${SRCDATE}"
diff --git a/packages/ixp425-eth/ixp400-eth_1.4.bb b/packages/ixp425-eth/ixp400-eth_1.4.bb
index 81dc5e9ec0..be0d1f339d 100644
--- a/packages/ixp425-eth/ixp400-eth_1.4.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.4.bb
@@ -2,7 +2,6 @@
 # to make it work on 2.6 kernels.
 #
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SRC_URI = "ftp://aiedownload.intel.com/df-support/8500/eng/GPL_ixp400LinuxEthernetDriverPatch-1_4.zip"
 SRC_URI += "file://ixp400-le-be.patch;patch=1"
 SRC_URI += "file://makefile.patch;patch=1"
diff --git a/packages/ixp425-eth/ixp400-eth_1.5.1.bb b/packages/ixp425-eth/ixp400-eth_1.5.1.bb
index fe9b166ded..d09c5955f3 100644
--- a/packages/ixp425-eth/ixp400-eth_1.5.1.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.5.1.bb
@@ -2,7 +2,6 @@ DEFAULT_PREFERENCE = "-1"
 # This is the Intel GPL IXP4XX ethernet driver (Linux) plus patches
 # to make it work on 2.6 kernels.
 #
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb
index 5163dd20e4..ae2cdf2d78 100644
--- a/packages/ixp425-eth/ixp400-eth_1.5.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.5.bb
@@ -1,7 +1,6 @@
 # This is the Intel GPL IXP4XX ethernet driver (Linux) plus patches
 # to make it work on 2.6 kernels.
 #
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "GPL"
 PR = "r15"
diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index 43330d6de2..92e11e3fd2 100644
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -1,6 +1,5 @@
 DEPENDS = "ixp4xx-csr patcher-native"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPatch-1_1.zip \
 	   http://nslu.sourceforge.net/downloads/ixp425_eth.c.patch \
 	   file://makefile.patch;patch=1 \
diff --git a/packages/ixp425-eth/ixp425-eth_1.2.bb b/packages/ixp425-eth/ixp425-eth_1.2.bb
index a3587e8064..9d537d9126 100644
--- a/packages/ixp425-eth/ixp425-eth_1.2.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.2.bb
@@ -2,7 +2,6 @@
 # to make it work on 2.6 kernels.
 #
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SRC_URI = "ftp://download.intel.com/design/network/swsup/ixp400linuxethernetdriverpatch-1_2.zip"
 SRC_URI += "file://ixp400linuxethernetdriver-1_2-kernel26_hr_20050929.patch;patch=1"
 SRC_URI += "file://makefile.patch;patch=1"
diff --git a/packages/ixp4xx/ixp-osal_1.5.bb b/packages/ixp4xx/ixp-osal_1.5.bb
index bfb76a3fc6..58bbb1d700 100644
--- a/packages/ixp4xx/ixp-osal_1.5.bb
+++ b/packages/ixp4xx/ixp-osal_1.5.bb
@@ -1,6 +1,5 @@
 # Intel ixp4xx access library software.  Note that this has an Intel
 # license which restricts its use.
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm"
 LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm"
diff --git a/packages/ixp4xx/ixp-osal_2.0.bb b/packages/ixp4xx/ixp-osal_2.0.bb
index 4ca2543156..4f0f89b9cc 100644
--- a/packages/ixp4xx/ixp-osal_2.0.bb
+++ b/packages/ixp4xx/ixp-osal_2.0.bb
@@ -1,6 +1,5 @@
 # Intel ixp4xx access library software.  Note that this has an Intel
 # license which restricts its use.
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm"
 LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm"
diff --git a/packages/ixp4xx/ixp-osal_2.1.1.bb b/packages/ixp4xx/ixp-osal_2.1.1.bb
index 02206fb3cf..e7ba6ff8e7 100644
--- a/packages/ixp4xx/ixp-osal_2.1.1.bb
+++ b/packages/ixp4xx/ixp-osal_2.1.1.bb
@@ -1,7 +1,6 @@
 DEFAULT_PREFERENCE = "-1"
 # Intel ixp4xx access library software.  Note that this has an Intel
 # license which restricts its use.
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm"
 LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm"
diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb
index b020c9dafd..076fdf5c8f 100644
--- a/packages/ixp4xx/ixp-osal_2.1.bb
+++ b/packages/ixp4xx/ixp-osal_2.1.bb
@@ -1,6 +1,5 @@
 # Intel ixp4xx access library software.  Note that this has an Intel
 # license which restricts its use.
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm"
 LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm"
diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb
index 286ecf957a..65a427cd52 100644
--- a/packages/ixp4xx/ixp4xx-csr_1.4.bb
+++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb
@@ -1,6 +1,5 @@
 # Intel ixp4xx access library software.  Note that this has an Intel
 # license which restricts its use.
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm"
 LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm"
diff --git a/packages/ixp4xx/ixp4xx-csr_1.5.bb b/packages/ixp4xx/ixp4xx-csr_1.5.bb
index debdeb404f..4513a570eb 100644
--- a/packages/ixp4xx/ixp4xx-csr_1.5.bb
+++ b/packages/ixp4xx/ixp4xx-csr_1.5.bb
@@ -1,6 +1,5 @@
 # Intel ixp4xx access library software.  Note that this has an Intel
 # license which restricts its use.
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm"
 LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm"
diff --git a/packages/ixp4xx/ixp4xx-csr_2.0.bb b/packages/ixp4xx/ixp4xx-csr_2.0.bb
index 3fc86c272d..9dca08e182 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.0.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.0.bb
@@ -1,6 +1,5 @@
 # Intel ixp4xx access library software.  Note that this has an Intel
 # license which restricts its use.
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm"
 LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm"
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
index a21f42f018..c02876cfeb 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
@@ -1,7 +1,6 @@
 DEFAULT_PREFERENCE = "-1"
 # Intel ixp4xx access library software.  Note that this has an Intel
 # license which restricts its use.
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm"
 LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm"
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb
index 3bc29b3286..316823de5a 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb
@@ -1,6 +1,5 @@
 # Intel ixp4xx access library software.  Note that this has an Intel
 # license which restricts its use.
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm"
 LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm"
diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.1.bb b/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
index d9f2dd3b28..ea7d747a3e 100644
--- a/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "Intel Public Licence"
 PR = "r3"
 
diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.3.bb b/packages/ixp4xx/ixp4xx-npe-native_2.3.bb
index b4c78f6c0f..9744e06c3d 100644
--- a/packages/ixp4xx/ixp4xx-npe-native_2.3.bb
+++ b/packages/ixp4xx/ixp4xx-npe-native_2.3.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "Intel Public Licence"
 PR = "r3"
 
diff --git a/packages/ixp4xx/ixp4xx-npe_2.1.bb b/packages/ixp4xx/ixp4xx-npe_2.1.bb
index efeb0cbbba..bbc57f2ca2 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.1.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "Intel Public Licence"
 PR = "r6"
 DEPENDS = "ixp4xx-npe-native"
diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb
index babb7e1292..039308ac47 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.3.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "Intel Public Licence"
 PR = "r6"
 DEPENDS = "ixp4xx-npe-native"
diff --git a/packages/jack/jack_0.99.0.bb b/packages/jack/jack_0.99.0.bb
index ebd2bd18ab..12d5bff0e0 100644
--- a/packages/jack/jack_0.99.0.bb
+++ b/packages/jack/jack_0.99.0.bb
@@ -4,7 +4,6 @@ device, as well as allowing them to share audio between \
 themselves."
 SECTION = "libs/multimedia"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL LGPL" 
 PR = "r0"
 
diff --git a/packages/jamvm/jamvm_1.3.0.bb b/packages/jamvm/jamvm_1.3.0.bb
index e33a671af3..ffdf74938f 100644
--- a/packages/jamvm/jamvm_1.3.0.bb
+++ b/packages/jamvm/jamvm_1.3.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specific
 HOMEPAGE = "http://jamvm.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "interpreters"
 
 DEPENDS = "zlib classpath"
diff --git a/packages/jamvm/jamvm_1.3.1.bb b/packages/jamvm/jamvm_1.3.1.bb
index 7d674dc720..20b1535707 100644
--- a/packages/jamvm/jamvm_1.3.1.bb
+++ b/packages/jamvm/jamvm_1.3.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specific
 HOMEPAGE = "http://jamvm.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "interpreters"
 
 DEPENDS = "zlib classpath"
diff --git a/packages/jamvm/jamvm_1.3.2.bb b/packages/jamvm/jamvm_1.3.2.bb
index 65eb0525b1..9727fd6cda 100644
--- a/packages/jamvm/jamvm_1.3.2.bb
+++ b/packages/jamvm/jamvm_1.3.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specific
 HOMEPAGE = "http://jamvm.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "interpreters"
 
 DEPENDS = "zlib classpath"
diff --git a/packages/jamvm/jamvm_1.4.1.bb b/packages/jamvm/jamvm_1.4.1.bb
index 65eb0525b1..9727fd6cda 100644
--- a/packages/jamvm/jamvm_1.4.1.bb
+++ b/packages/jamvm/jamvm_1.4.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specific
 HOMEPAGE = "http://jamvm.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "interpreters"
 
 DEPENDS = "zlib classpath"
diff --git a/packages/jamvm/jamvm_1.4.2.bb b/packages/jamvm/jamvm_1.4.2.bb
index d54198690c..489b4fb94b 100644
--- a/packages/jamvm/jamvm_1.4.2.bb
+++ b/packages/jamvm/jamvm_1.4.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specific
 HOMEPAGE = "http://jamvm.sourceforge.net/"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "interpreters"
 
 DEPENDS = "zlib classpath"
diff --git a/packages/jikes/jikes_1.21.bb b/packages/jikes/jikes_1.21.bb
index aeeadc45a6..c7a8c6afe7 100644
--- a/packages/jikes/jikes_1.21.bb
+++ b/packages/jikes/jikes_1.21.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Java compiler adhering to language and VM specifications"
 HOMEPAGE = "http://jikes.sourceforge.net/"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "devel"
 LICENSE = "IBM"
 PR = "r2"
diff --git a/packages/jikes/jikes_1.22.bb b/packages/jikes/jikes_1.22.bb
index 728b30087a..3ed510a7f1 100644
--- a/packages/jikes/jikes_1.22.bb
+++ b/packages/jikes/jikes_1.22.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Java compiler adhering to language and VM specifications"
 HOMEPAGE = "http://jikes.sourceforge.net/"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "devel"
 LICENSE = "IBM"
 PR = "r0"
diff --git a/packages/joe/joe_3.1.bb b/packages/joe/joe_3.1.bb
index dcf664808c..31050477b8 100644
--- a/packages/joe/joe_3.1.bb
+++ b/packages/joe/joe_3.1.bb
@@ -1,6 +1,5 @@
 SECTION = "console/utils"
 DESCRIPTION = "Joe's own editor."
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE ="GPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz"
 
diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index e96f8001a4..659a5147bb 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -1,7 +1,6 @@
 PR = "r4"
 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/packages/js/js_1.5.bb b/packages/js/js_1.5.bb
index 040538a8ff..5f8323769f 100644
--- a/packages/js/js_1.5.bb
+++ b/packages/js/js_1.5.bb
@@ -4,7 +4,6 @@ SECTION = "libs"
 DEPENDS = "readline"
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.5.tar.gz \
 	   file://jsautocfg.h"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
 
 S = "${WORKDIR}/js/src"
 
diff --git a/packages/juce/juce_1.29.bb b/packages/juce/juce_1.29.bb
index 20b59fb9c2..c5a920a0dc 100644
--- a/packages/juce/juce_1.29.bb
+++ b/packages/juce/juce_1.29.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "JUCE is a cross-platform application framework"
 HOMEPAGE = "http://www.rawmaterialsoftware.com/juce"
 AUTHOR = "Julian Stoerer"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib freetype virtual/libx11"
 PR = "r0"
diff --git a/packages/justreader/justreader_2.0k.bb b/packages/justreader/justreader_2.0k.bb
index fc08ea6102..f3f71493fc 100644
--- a/packages/justreader/justreader_2.0k.bb
+++ b/packages/justreader/justreader_2.0k.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "An E-Books reader for Qt/Embedded based Palmtop Environments"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://justreader.sourceforge.net/"
 PR = "r3"
diff --git a/packages/kaffe/kaffe-gtk_1.1.5.bb b/packages/kaffe/kaffe-gtk_1.1.5.bb
index 48077ce1e3..2e53f1938b 100644
--- a/packages/kaffe/kaffe-gtk_1.1.5.bb
+++ b/packages/kaffe/kaffe-gtk_1.1.5.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 
 SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz"
 S = "${WORKDIR}/kaffe-${PV}"
diff --git a/packages/kaffe/kaffe-gtk_cvs.bb b/packages/kaffe/kaffe-gtk_cvs.bb
index bc464e6e63..c48f48f1cc 100644
--- a/packages/kaffe/kaffe-gtk_cvs.bb
+++ b/packages/kaffe/kaffe-gtk_cvs.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 
 PV = "1.1.5+cvs${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/kanatest/kanatest.inc b/packages/kanatest/kanatest.inc
index 938b2cd7d0..254091c60c 100644
--- a/packages/kanatest/kanatest.inc
+++ b/packages/kanatest/kanatest.inc
@@ -1,6 +1,5 @@
 SECTION = "gpe/games"
 DESCRIPTION = "Hiragana and Katakana drill tool"
-MAINTAINER = "Robert Marcano <robert@marcanoonline.com>"
 LICENSE = "GPL"
 
 DEPENDS = "gtk+"
diff --git a/packages/kbd/kbd_1.12.bb b/packages/kbd/kbd_1.12.bb
index 9b0250334e..71331650f6 100644
--- a/packages/kbd/kbd_1.12.bb
+++ b/packages/kbd/kbd_1.12.bb
@@ -2,7 +2,6 @@
 # Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 
 SRC_URI="http://ftp.debian.org/debian/pool/main/k/kbd/kbd_1.12.orig.tar.gz"
 
diff --git a/packages/kbdd/kbdd_cvs.bb b/packages/kbdd/kbdd_cvs.bb
index 6f1accd570..18d8bf6391 100644
--- a/packages/kbdd/kbdd_cvs.bb
+++ b/packages/kbdd/kbdd_cvs.bb
@@ -1,6 +1,5 @@
 SECTION = "console/utils"
 DESCRIPTION = "User-space keyboard daemon for external keyboards"
-MAINTAINER = "Paul Eggleton <paule@handhelds.org>"
 HOMEPAGE = "http://handhelds.org/moin/moin.cgi/kbdd"
 LICENSE = "GPLv2"
 DEPENDS = "virtual/kernel"
diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index 3fa8781658..cb845397bd 100644
--- a/packages/kdepimpi/kdepimpi-base.inc
+++ b/packages/kdepimpi/kdepimpi-base.inc
@@ -12,7 +12,6 @@ SECTION = "opie/pim"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 
 # we can't build:
 # kabc/plugins/sharpdtm - wants libsl     (Sharp ROM 3.x closed source library)
diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb
index 595faec89f..c219ed7641 100644
--- a/packages/keymap-locales/keymap-locales.bb
+++ b/packages/keymap-locales/keymap-locales.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Localized key mappings"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 
 PR = "r6"
diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb
index 87edceffca..9bd2a6583a 100644
--- a/packages/keymaps/keymaps_1.0.bb
+++ b/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/packages/keyring/keyring_0.6.8.bb b/packages/keyring/keyring_0.6.8.bb
index 10fcc9e998..0756ca80e6 100644
--- a/packages/keyring/keyring_0.6.8.bb
+++ b/packages/keyring/keyring_0.6.8.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Stores accounts and passwords in an encrypted file."
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Robert Anderson <rea@sr.unh.edu>"
 LICENSE = "GPL"
 DEPENDS = "gdbm"
 PR = "r2"
diff --git a/packages/kf/kf_0.5.4.1.bb b/packages/kf/kf_0.5.4.1.bb
index fee7cd89ea..39229f7a9b 100755
--- a/packages/kf/kf_0.5.4.1.bb
+++ b/packages/kf/kf_0.5.4.1.bb
@@ -1,6 +1,5 @@
 LICENSE = "GPL"
 DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Kf is a GTK+ instant messaging client."
 PR = "r2"
 
diff --git a/packages/kismet/kismet_2004-04-R1.bb b/packages/kismet/kismet_2004-04-R1.bb
index 9c864a3f86..30e31075fd 100644
--- a/packages/kismet/kismet_2004-04-R1.bb
+++ b/packages/kismet/kismet_2004-04-R1.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 HOMEPAGE = "http://www.kismetwireless.net/"
 LICENSE = "GPLv2"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 DEPENDS = "expat gmp"
 
 SRC_URI = "http://www.kismetwireless.net/code/kismet-2004-04-R1.tar.gz \
diff --git a/packages/kismet/kismet_2005-01-R1.bb b/packages/kismet/kismet_2005-01-R1.bb
index 1ab7048863..792cc38384 100644
--- a/packages/kismet/kismet_2005-01-R1.bb
+++ b/packages/kismet/kismet_2005-01-R1.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 HOMEPAGE = "http://www.kismetwireless.net/"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 LICENSE = "GPLv2"
 DEPENDS = "expat gmp"
 
diff --git a/packages/kismet/kismet_2005-04-R1.bb b/packages/kismet/kismet_2005-04-R1.bb
index 181c2a3a17..752789a0ba 100644
--- a/packages/kismet/kismet_2005-04-R1.bb
+++ b/packages/kismet/kismet_2005-04-R1.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 HOMEPAGE = "http://www.kismetwireless.net/"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 LICENSE = "GPLv2"
 DEPENDS = "expat gmp"
 
diff --git a/packages/kismet/kismet_2005-08-R1.bb b/packages/kismet/kismet_2005-08-R1.bb
index cf3d9ea64b..9c8c444991 100644
--- a/packages/kismet/kismet_2005-08-R1.bb
+++ b/packages/kismet/kismet_2005-08-R1.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 HOMEPAGE = "http://www.kismetwireless.net/"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 LICENSE = "GPLv2"
 DEPENDS = "expat gmp"
 
diff --git a/packages/kismet/kismet_2006-04-R1.bb b/packages/kismet/kismet_2006-04-R1.bb
index 44fb768c95..ac32560286 100644
--- a/packages/kismet/kismet_2006-04-R1.bb
+++ b/packages/kismet/kismet_2006-04-R1.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 HOMEPAGE = "http://www.kismetwireless.net/"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 LICENSE = "GPLv2"
 DEPENDS = "expat gmp"
 
diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc
index 7f1b503f12..be9448afb6 100644
--- a/packages/klibc/klibc.inc
+++ b/packages/klibc/klibc.inc
@@ -3,7 +3,6 @@ SECTION = "libs"
 DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \
 use with initramfs.  It is deliberately written for small size, \
 minimal entaglement, and portability, not speed."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "BSD-ADV"
 SRC_URI = "http://www.kernel.org/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2"
 SRC_URI += "file://install.patch;patch=1"
diff --git a/packages/klimt/klimt_0.6.1.bb b/packages/klimt/klimt_0.6.1.bb
index fbb67de480..4e516fc90d 100644
--- a/packages/klimt/klimt_0.6.1.bb
+++ b/packages/klimt/klimt_0.6.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Klimt is a software OpenGL rendering library for Qt/Embedded based Palmtop Environments"
 SECTION = "opie/libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/knights/knights_1.14.bb b/packages/knights/knights_1.14.bb
index 777ac6bda8..1e0766a7c7 100644
--- a/packages/knights/knights_1.14.bb
+++ b/packages/knights/knights_1.14.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Chess Game for Qt/Embedded based palmtop environments. \
 Uses the Phalanx chess engine."
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "phalanx"
 RDEPENDS = "phalanx"
diff --git a/packages/kphonepi/kphonepi_1.0.0.bb b/packages/kphonepi/kphonepi_1.0.0.bb
index cf4fcdf76f..fe1024afa8 100644
--- a/packages/kphonepi/kphonepi_1.0.0.bb
+++ b/packages/kphonepi/kphonepi_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Kphone/Pi is a 'Voice Over Internet' phone which uses the Session Initiation Protocol (SIP)."
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.pi-sync.net/html/kp_pi.html"
 DEPENDS ="openssl"
diff --git a/packages/ksymoops/ksymoops_2.4.9.bb b/packages/ksymoops/ksymoops_2.4.9.bb
index 783b4981e4..52bd0bfcde 100644
--- a/packages/ksymoops/ksymoops_2.4.9.bb
+++ b/packages/ksymoops/ksymoops_2.4.9.bb
@@ -1,6 +1,5 @@
 SECTION = "console/utils"
 DESCRIPTION = "Kernel oops and error message decoder."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPLv2"
 DEPENDS = "binutils"
 
diff --git a/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb b/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
index 251694103d..7724a3605f 100644
--- a/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
+++ b/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Time tracking program"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 HOMEPAGE = "http://www.pi-sync.net"
 PR = "r1"
 
diff --git a/packages/lbreakout/lbreakout2_2.6beta.bb b/packages/lbreakout/lbreakout2_2.6beta.bb
index dee655cc91..49becccbd3 100644
--- a/packages/lbreakout/lbreakout2_2.6beta.bb
+++ b/packages/lbreakout/lbreakout2_2.6beta.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "LBreakout2 is an award winning breakout-style arcade game in the
 HOMEPAGE = "http://lgames.sourceforge.net/index.php?project=LBreakout2"
 SECTION = "games/arcade"
 LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer"
 DEPENDS = "virtual/libsdl libsdl-mixer libsdl-net"
 PR = "r1"
 
diff --git a/packages/lcdproc/lcdproc_0.4.5.bb b/packages/lcdproc/lcdproc_0.4.5.bb
index 4bfc7609c8..855dfb5a6e 100644
--- a/packages/lcdproc/lcdproc_0.4.5.bb
+++ b/packages/lcdproc/lcdproc_0.4.5.bb
@@ -3,7 +3,6 @@ shipped with this package can be used to acquire various kinds of system stats."
 HOMEPAGE = "http://lcdproc.org"
 LICENSE ="GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "utils"
 
 DEPENDS = "${@((bb.data.getVar('LCDPROC_DRIVERS',d) or 'curses,text').find('curses') != -1) and 'ncurses' or ''}"
diff --git a/packages/lcdproc/lcdproc_0.4.99+cvs20060123.bb b/packages/lcdproc/lcdproc_0.4.99+cvs20060123.bb
index 5d77ca2089..1a14afb422 100644
--- a/packages/lcdproc/lcdproc_0.4.99+cvs20060123.bb
+++ b/packages/lcdproc/lcdproc_0.4.99+cvs20060123.bb
@@ -4,7 +4,6 @@ DESCRIPTION_append_lcdd = " This package contains the LCDd server."
 HOMEPAGE = "http://lcdproc.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "utils"
 
 DEPENDS = "${@((bb.data.getVar('LCDPROC_DRIVERS',d) or 'curses,text').find('curses') != -1) and 'ncurses' or ''}"
diff --git a/packages/lcdproc/lcdproc_0.5.0.bb b/packages/lcdproc/lcdproc_0.5.0.bb
index 8c7c53d17b..08e4e00707 100644
--- a/packages/lcdproc/lcdproc_0.5.0.bb
+++ b/packages/lcdproc/lcdproc_0.5.0.bb
@@ -3,7 +3,6 @@ shipped with this package can be used to acquire various kinds of system stats."
 HOMEPAGE = "http://lcdproc.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 SECTION = "utils"
 PR="r2"
 
diff --git a/packages/lcdproc/lcdproc_cvs.bb b/packages/lcdproc/lcdproc_cvs.bb
index e73dd8d08c..7f02dd8ffe 100644
--- a/packages/lcdproc/lcdproc_cvs.bb
+++ b/packages/lcdproc/lcdproc_cvs.bb
@@ -4,7 +4,6 @@ DESCRIPTION_append_lcdd = " This package contains the LCDd server."
 HOMEPAGE = "http://lcdproc.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "utils"
 PV = "0.4.99+cvs${SRCDATE}"
 
diff --git a/packages/lemon/lemon.inc b/packages/lemon/lemon.inc
index d50facd39a..9dcadbd674 100644
--- a/packages/lemon/lemon.inc
+++ b/packages/lemon/lemon.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "The Lemon Parser Generator"
 HOMEPAGE = "http://www.hwaci.com/sw/lemon/"
 LICENSE = "PD"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "optional"
 SECTION = "devel"
 
diff --git a/packages/libaal/libaal_1.0.4.bb b/packages/libaal/libaal_1.0.4.bb
index a3e1abd7cc..0acfccc48d 100644
--- a/packages/libaal/libaal_1.0.4.bb
+++ b/packages/libaal/libaal_1.0.4.bb
@@ -4,7 +4,6 @@
 PR = "r1"
 DESCRIPTION = "Library for user-level code accessing Reiser4 filesystems"
 HOMEPAGE = "http://www.namesys.com"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "base"
 LICENSE = "GPL-2"
 
diff --git a/packages/libaio/libaio-oracle_0.3.0.bb b/packages/libaio/libaio-oracle_0.3.0.bb
index 88f0fb5fff..d5a6c300fd 100644
--- a/packages/libaio/libaio-oracle_0.3.0.bb
+++ b/packages/libaio/libaio-oracle_0.3.0.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION="This is a library for accessing the new AIO system calls (asynchronous i/o) for the Linux kernel."
 HOMEPAGE="http://oss.oracle.com/projects/libaio-oracle"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE="GPL"
 
 SRC_URI="http://oss.oracle.com/projects/libaio-oracle/dist/files/${PN}-${PV}.tar.gz"
diff --git a/packages/libaio/libaio_0.3.103.bb b/packages/libaio/libaio_0.3.103.bb
index 201e116623..f78e9c9be4 100644
--- a/packages/libaio/libaio_0.3.103.bb
+++ b/packages/libaio/libaio_0.3.103.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
 HOMEPAGE="https://rhn.redhat.com/errata/RHBA-2005-085.html"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE="GPL"
 
 SRC_URI="http://search.belnet.be/packages/lineox/4.0/updates/SRPMS/${P}-3.src.rpm \
diff --git a/packages/libao/libao-alsa_0.8.6.bb b/packages/libao/libao-alsa_0.8.6.bb
index 4df98e1cca..b1b7e0e4c2 100644
--- a/packages/libao/libao-alsa_0.8.6.bb
+++ b/packages/libao/libao-alsa_0.8.6.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "A cross platform audio library. This is the ALSA plugin."
 HOMEPAGE = "http://www.xiph.org/ao/"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>"
 DEPENDS = "alsa-lib libao"
 RDEPENDS = "libao2 (>=${PV})"
 PR = "r1"
diff --git a/packages/libao/libao-plugin-alsa_0.8.6.bb b/packages/libao/libao-plugin-alsa_0.8.6.bb
index 30cde27074..91cbc6f2d3 100644
--- a/packages/libao/libao-plugin-alsa_0.8.6.bb
+++ b/packages/libao/libao-plugin-alsa_0.8.6.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "A cross platform audio library. This is the ALSA plugin."
 HOMEPAGE = "http://www.xiph.org/ao/"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>"
 DEPENDS = "alsa-lib libao"
 RDEPENDS = "libao2 (>=${PV})"
 PROVIDES = "libao-alsa"
diff --git a/packages/libccaudio2/libccaudio2_0.9.0.bb b/packages/libccaudio2/libccaudio2_0.9.0.bb
index 854792be4b..f38017833d 100644
--- a/packages/libccaudio2/libccaudio2_0.9.0.bb
+++ b/packages/libccaudio2/libccaudio2_0.9.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "a C++ class library for generating and recognising sounds."
 HOMEPAGE = "http://www.gnu.org/software/ccaudio/"
 LICENSE = "GPL"
 SECTION = "libs"
-MAINTAINER = "Martin Dietze <dietze@4g-systems.com>, Thomas Geffert <geffert@4g-systems.com>"
 PR = "r1"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/ccaudio/ccaudio2-${PV}.tar.gz \
diff --git a/packages/libcdaudio/libcdaudio_0.99.12p2.bb b/packages/libcdaudio/libcdaudio_0.99.12p2.bb
index e661202423..91b80611d4 100644
--- a/packages/libcdaudio/libcdaudio_0.99.12p2.bb
+++ b/packages/libcdaudio/libcdaudio_0.99.12p2.bb
@@ -5,7 +5,6 @@
 HOMEPAGE = "http://libcdaudio.sourceforge.net/"
 DESCRIPTION = "Portable library for controlling audio CDs"
 SECTION = "libs"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/libcgicc/libcgicc_3.2.3.bb b/packages/libcgicc/libcgicc_3.2.3.bb
index adf5108c12..dc066f1f2f 100644
--- a/packages/libcgicc/libcgicc_3.2.3.bb
+++ b/packages/libcgicc/libcgicc_3.2.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "a C++ class library for writing CGI applications"
 HOMEPAGE = "http://www.cgicc.org/"
 LICENSE = "LGPL"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 
 SRC_URI = "http://www.cgicc.org/files/cgicc-${PV}.tar.bz2"
 S = "${WORKDIR}/cgicc-${PV}"
diff --git a/packages/libcontactsdb/libcontactsdb_0.1.bb b/packages/libcontactsdb/libcontactsdb_0.1.bb
index 93950a3e1c..62b7566700 100644
--- a/packages/libcontactsdb/libcontactsdb_0.1.bb
+++ b/packages/libcontactsdb/libcontactsdb_0.1.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Database access library for GPE contacts"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS = "libgpewidget libgpepimc sqlite"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 PR = "r0"
 GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/libcontactsdb/libcontactsdb_0.3.bb b/packages/libcontactsdb/libcontactsdb_0.3.bb
index 93950a3e1c..62b7566700 100644
--- a/packages/libcontactsdb/libcontactsdb_0.3.bb
+++ b/packages/libcontactsdb/libcontactsdb_0.3.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Database access library for GPE contacts"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS = "libgpewidget libgpepimc sqlite"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 PR = "r0"
 GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/libcontactsdb/libcontactsdb_0.4.bb b/packages/libcontactsdb/libcontactsdb_0.4.bb
index 93950a3e1c..62b7566700 100644
--- a/packages/libcontactsdb/libcontactsdb_0.4.bb
+++ b/packages/libcontactsdb/libcontactsdb_0.4.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Database access library for GPE contacts"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS = "libgpewidget libgpepimc sqlite"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 PR = "r0"
 GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/libcontactsdb/libcontactsdb_0.5.bb b/packages/libcontactsdb/libcontactsdb_0.5.bb
index 30bc282da6..1bdb40ac25 100644
--- a/packages/libcontactsdb/libcontactsdb_0.5.bb
+++ b/packages/libcontactsdb/libcontactsdb_0.5.bb
@@ -3,7 +3,6 @@ LICENSE = "LGPL"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS = "libgpewidget libgpepimc sqlite"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/libcroco/libcroco_0.6.0.bb b/packages/libcroco/libcroco_0.6.0.bb
index 465346cd5d..ed2d303ecb 100644
--- a/packages/libcroco/libcroco_0.6.0.bb
+++ b/packages/libcroco/libcroco_0.6.0.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
 SECTION = "x11/utils"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "glib-2.0 libxml2"
 LICENSE = "LGPL"
 PR = "r2"
diff --git a/packages/libcroco/libcroco_0.6.1.bb b/packages/libcroco/libcroco_0.6.1.bb
index 5e1ccf3cb5..cc7fc05d62 100644
--- a/packages/libcroco/libcroco_0.6.1.bb
+++ b/packages/libcroco/libcroco_0.6.1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
 SECTION = "x11/utils"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "glib-2.0 libxml2"
 LICENSE = "LGPL"
 PR = "r2"
diff --git a/packages/libcwd/libcwd_0.99.44.bb b/packages/libcwd/libcwd_0.99.44.bb
index 1288ea6e75..d0ec7c3a4d 100644
--- a/packages/libcwd/libcwd_0.99.44.bb
+++ b/packages/libcwd/libcwd_0.99.44.bb
@@ -5,7 +5,6 @@ printing source line number information and demangled type names."
 SECTION = "devel/libs"
 LICENSE = "QPL"
 HOMEPAGE = "http://libcwd.sourceforge.net"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 
 SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/libcwd/libcwd-${PV}.tar.gz"
diff --git a/packages/libdaemon/libdaemon_0.10.bb b/packages/libdaemon/libdaemon_0.10.bb
index 6f4c5eac54..a166414e61 100644
--- a/packages/libdaemon/libdaemon_0.10.bb
+++ b/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/packages/libdaemon/libdaemon_0.6.bb b/packages/libdaemon/libdaemon_0.6.bb
index 2bdf8cb5cc..bdf52503c0 100644
--- a/packages/libdaemon/libdaemon_0.6.bb
+++ b/packages/libdaemon/libdaemon_0.6.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 = "GPLv2"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
diff --git a/packages/libdbi/libdbi-drivers_0.7.1.bb b/packages/libdbi/libdbi-drivers_0.7.1.bb
index ec2bc9f11e..2d1d057be8 100644
--- a/packages/libdbi/libdbi-drivers_0.7.1.bb
+++ b/packages/libdbi/libdbi-drivers_0.7.1.bb
@@ -6,7 +6,6 @@ DESCRIPTION = "Database Drivers for libdbi"
 HOMEPAGE = "http://libdbi-drivers.sourceforge.net/"
 LICENSE = "GPLv2"
 SECTION = "libs"
-MAINTAINER = "Eddy Pronk <epronk@muftor.com>"
 
 PROVIDES = "libdbd-sqlite"
 DEPENDS = "libdbi sqlite"
diff --git a/packages/libdbi/libdbi_0.7.2.bb b/packages/libdbi/libdbi_0.7.2.bb
index ba47c68573..8737890368 100644
--- a/packages/libdbi/libdbi_0.7.2.bb
+++ b/packages/libdbi/libdbi_0.7.2.bb
@@ -6,7 +6,6 @@ DESCRIPTION = "Database Independent Abstraction Layer for C"
 HOMEPAGE = "http://libdbi.sourceforge.net/"
 LICENSE = "LGPL"
 SECTION = "libs"
-MAINTAINER = "Eddy Pronk <epronk@muftor.com>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi/libdbi-${PV}.tar.gz"
 
diff --git a/packages/libdisplaymigration/libdisplaymigration_0.28.bb b/packages/libdisplaymigration/libdisplaymigration_0.28.bb
index 9efa17ec3f..e92cf57ce8 100644
--- a/packages/libdisplaymigration/libdisplaymigration_0.28.bb
+++ b/packages/libdisplaymigration/libdisplaymigration_0.28.bb
@@ -1,7 +1,6 @@
 LICENSE = "LGPL"
 DESCRIPTION = "Gtk+ display migration library"
 DEPENDS = "gtk+ libgcrypt"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 PR = "r1"
diff --git a/packages/libdisplaymigration/libdisplaymigration_0.99.bb b/packages/libdisplaymigration/libdisplaymigration_0.99.bb
index 8bc9ebaaa7..0563ba3eea 100644
--- a/packages/libdisplaymigration/libdisplaymigration_0.99.bb
+++ b/packages/libdisplaymigration/libdisplaymigration_0.99.bb
@@ -1,7 +1,6 @@
 LICENSE = "LGPL"
 DESCRIPTION = "Gtk+ display migration library (dummy version)"
 DEPENDS = "gtk+"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 PR = "r0"
diff --git a/packages/libdvb/libdvb_0.5.5.1.bb b/packages/libdvb/libdvb_0.5.5.1.bb
index 2f5e77034d..13ebc5e0a7 100644
--- a/packages/libdvb/libdvb_0.5.5.1.bb
+++ b/packages/libdvb/libdvb_0.5.5.1.bb
@@ -3,7 +3,6 @@ DESCRIPTION_libdvb-dev = "Headers for libdvb development"
 HOMEPAGE = "http://www.metzlerbros.org/dvb/index.html"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/libdvdnav/libdvdnav_0.1.10.bb b/packages/libdvdnav/libdvdnav_0.1.10.bb
index cef4183571..d4a90f38c8 100644
--- a/packages/libdvdnav/libdvdnav_0.1.10.bb
+++ b/packages/libdvdnav/libdvdnav_0.1.10.bb
@@ -5,7 +5,6 @@
 HOMEPAGE="http://dvd.sourceforge.net/"
 DESCRIPTION="DVD navigation multimeda library"
 SECTION = "libs"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/libedit/libedit_20050118.bb b/packages/libedit/libedit_20050118.bb
index 472397c881..eee231a22a 100644
--- a/packages/libedit/libedit_20050118.bb
+++ b/packages/libedit/libedit_20050118.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "BSD replacement for libreadline"
 HOMEPAGE = "http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/"
 SECTION = "libs"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE="BSD"
 DEPENDS = "ncurses"
 PR = "r1"
diff --git a/packages/libeina/libeina_0.96.5.bb b/packages/libeina/libeina_0.96.5.bb
index d142c5ef67..388f61e0a0 100644
--- a/packages/libeina/libeina_0.96.5.bb
+++ b/packages/libeina/libeina_0.96.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Multimedia library using gstreamer""
 HOMEPAGE = "http://bolgo.cent.uji.es/proyectos/eina"
 LICENSE = "GPL"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = "file glib-2.0 gstreamer"
 
diff --git a/packages/libeina/libeina_0.96.7.bb b/packages/libeina/libeina_0.96.7.bb
index 515654363e..e76e99f95b 100644
--- a/packages/libeina/libeina_0.96.7.bb
+++ b/packages/libeina/libeina_0.96.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Multimedia library using gstreamer"
 HOMEPAGE = "http://bolgo.cent.uji.es/proyectos/eina"
 LICENSE = "GPL"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PR = "r2"
 
 DEPENDS = "glib-2.0 gstreamer"
diff --git a/packages/libelf/libelf_0.8.3.bb b/packages/libelf/libelf_0.8.3.bb
index 3bd384b32a..65e3e66628 100644
--- a/packages/libelf/libelf_0.8.3.bb
+++ b/packages/libelf/libelf_0.8.3.bb
@@ -1,5 +1,4 @@
 SECTION = "libs"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DESCRIPTION = "an ELF object file access library \
 The elf library provides routines to access, and manipulate, Elf object \
 files. It is still not complete, but is required for a number of programs, \
diff --git a/packages/libevent/libevent_1.1a.bb b/packages/libevent/libevent_1.1a.bb
index 38dbfe0cda..7cbbac2dfe 100644
--- a/packages/libevent/libevent_1.1a.bb
+++ b/packages/libevent/libevent_1.1a.bb
@@ -4,7 +4,6 @@ Furthermore, libevent also support callbacks due to signals or regular timeouts.
 HOMEPAGE = "http://www.monkey.org/~provos/libevent/"
 SECTION = "libs"
 AUTHOR = "Niels Provos <provos@citi.umich.edu>"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "BSD"
 
 SRC_URI = "http://monkey.org/~provos/libevent-${PV}.tar.gz"
diff --git a/packages/libeventdb/libeventdb_0.17.bb b/packages/libeventdb/libeventdb_0.17.bb
index 590533cae7..282383108b 100644
--- a/packages/libeventdb/libeventdb_0.17.bb
+++ b/packages/libeventdb/libeventdb_0.17.bb
@@ -2,7 +2,6 @@ LICENSE = "LGPL"
 DESCRIPTION = "Database access library for GPE calendar"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "libgpewidget libgpepimc sqlite"
 
 GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/libeventdb/libeventdb_0.19.bb b/packages/libeventdb/libeventdb_0.19.bb
index 30dc81c34c..b8318bd407 100644
--- a/packages/libeventdb/libeventdb_0.19.bb
+++ b/packages/libeventdb/libeventdb_0.19.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Database access library for GPE calendar"
 SECTION  = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS  = "libgpewidget libgpepimc sqlite"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/libeventdb/libeventdb_0.21.bb b/packages/libeventdb/libeventdb_0.21.bb
index 30dc81c34c..b8318bd407 100644
--- a/packages/libeventdb/libeventdb_0.21.bb
+++ b/packages/libeventdb/libeventdb_0.21.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Database access library for GPE calendar"
 SECTION  = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS  = "libgpewidget libgpepimc sqlite"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/libeventdb/libeventdb_0.30.bb b/packages/libeventdb/libeventdb_0.30.bb
index 38d48098d6..f125653b3e 100644
--- a/packages/libeventdb/libeventdb_0.30.bb
+++ b/packages/libeventdb/libeventdb_0.30.bb
@@ -5,7 +5,6 @@ DESCRIPTION = "Database access library for GPE calendar"
 SECTION  = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS  = "libgpewidget libgpepimc sqlite"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/libeventdb/libeventdb_cvs.bb b/packages/libeventdb/libeventdb_cvs.bb
index 1a4a5c21ba..4dc7aa796f 100644
--- a/packages/libeventdb/libeventdb_cvs.bb
+++ b/packages/libeventdb/libeventdb_cvs.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Database access library for GPE calendar"
 SECTION  = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS  = "libgpewidget libgpepimc sqlite"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PV = "0.30+cvs${SRCDATE}"
 PR = "r0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/libexif/libexif_0.6.9.bb b/packages/libexif/libexif_0.6.9.bb
index cd68bf1855..d255f5d862 100644
--- a/packages/libexif/libexif_0.6.9.bb
+++ b/packages/libexif/libexif_0.6.9.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG p
 HOMEPAGE = "http://sourceforge.net/projects/libexif"
 LICENSE = "LGPL"
 SECTION = "libs"
-MAINTAINER = "Eddy Pronk <epronk@muftor.com>"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz"
diff --git a/packages/libffi/libffi_2.0+gcc3.4.1.bb b/packages/libffi/libffi_2.0+gcc3.4.1.bb
index 843e888391..3e0d789412 100644
--- a/packages/libffi/libffi_2.0+gcc3.4.1.bb
+++ b/packages/libffi/libffi_2.0+gcc3.4.1.bb
@@ -2,7 +2,6 @@ SECTION = "libs"
 DESCRIPTION = "Foreign Function Interface library"
 LICENSE = "libffi"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 PR = "r1"
 
 inherit autotools gettext
diff --git a/packages/libgcrypt/libgcrypt_1.2.2.bb b/packages/libgcrypt/libgcrypt_1.2.2.bb
index cd49d0b8fa..e797ee75c7 100644
--- a/packages/libgcrypt/libgcrypt_1.2.2.bb
+++ b/packages/libgcrypt/libgcrypt_1.2.2.bb
@@ -3,7 +3,6 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL FDL"
 DEPENDS = "libgpg-error"
-MAINTAINER = "Eric Shattow <lucent@gmail.com>"
 
 # move libgcrypt-config into -dev package
 FILES_${PN} = "${libdir}/lib*.so.*"
diff --git a/packages/libglade/libglade_2.0.1.bb b/packages/libglade/libglade_2.0.1.bb
index 689f87261a..a923f38c30 100644
--- a/packages/libglade/libglade_2.0.1.bb
+++ b/packages/libglade/libglade_2.0.1.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Runtime support for GTK interface builder"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libxml2 gtk+"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-${PV}.tar.bz2 \
            file://glade-cruft.patch;patch=1;pnum=0 \
diff --git a/packages/libglade/libglade_2.4.0.bb b/packages/libglade/libglade_2.4.0.bb
index 57f55a879e..f1d76b737d 100644
--- a/packages/libglade/libglade_2.4.0.bb
+++ b/packages/libglade/libglade_2.4.0.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/packages/libglade/libglade_2.4.2.bb b/packages/libglade/libglade_2.4.2.bb
index f7f75e501d..b57d51d996 100644
--- a/packages/libglade/libglade_2.4.2.bb
+++ b/packages/libglade/libglade_2.4.2.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/packages/libglade/libglade_2.5.1.bb b/packages/libglade/libglade_2.5.1.bb
index 7738b10f93..4dcbe69828 100644
--- a/packages/libglade/libglade_2.5.1.bb
+++ b/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/packages/libglademm/libglademm_2.4.1.bb b/packages/libglademm/libglademm_2.4.1.bb
index 4230d76717..e36e134c09 100644
--- a/packages/libglademm/libglademm_2.4.1.bb
+++ b/packages/libglademm/libglademm_2.4.1.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "C++ bindings for the libglade library."
 HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>"
 DEPENDS = "gtkmm libglade"
 PR = "r0"
 
diff --git a/packages/libgpelaunch/libgpelaunch_0.10.bb b/packages/libgpelaunch/libgpelaunch_0.10.bb
index 3178955d79..dc5d09da98 100644
--- a/packages/libgpelaunch/libgpelaunch_0.10.bb
+++ b/packages/libgpelaunch/libgpelaunch_0.10.bb
@@ -1,7 +1,6 @@
 LICENSE = "LGPL"
 DESCRIPTION = "GPE program launcher library"
 SECTION = "libs"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ startup-notification"
 
 inherit autotools pkgconfig
diff --git a/packages/libgpelaunch/libgpelaunch_0.11.bb b/packages/libgpelaunch/libgpelaunch_0.11.bb
index 3178955d79..dc5d09da98 100644
--- a/packages/libgpelaunch/libgpelaunch_0.11.bb
+++ b/packages/libgpelaunch/libgpelaunch_0.11.bb
@@ -1,7 +1,6 @@
 LICENSE = "LGPL"
 DESCRIPTION = "GPE program launcher library"
 SECTION = "libs"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ startup-notification"
 
 inherit autotools pkgconfig
diff --git a/packages/libgpelaunch/libgpelaunch_0.12.bb b/packages/libgpelaunch/libgpelaunch_0.12.bb
index d42414d0d0..d7bc7d96fc 100644
--- a/packages/libgpelaunch/libgpelaunch_0.12.bb
+++ b/packages/libgpelaunch/libgpelaunch_0.12.bb
@@ -1,7 +1,6 @@
 LICENSE = "LGPL"
 DESCRIPTION = "GPE program launcher library"
 SECTION = "libs"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libgpewidget startup-notification"
 
 inherit autotools pkgconfig
diff --git a/packages/libgpelaunch/libgpelaunch_0.14.bb b/packages/libgpelaunch/libgpelaunch_0.14.bb
index d2b6aa5c52..3d9b6bea6b 100644
--- a/packages/libgpelaunch/libgpelaunch_0.14.bb
+++ b/packages/libgpelaunch/libgpelaunch_0.14.bb
@@ -1,7 +1,6 @@
 LICENSE = "LGPL"
 DESCRIPTION = "GPE program launcher library"
 SECTION = "libs"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ startup-notification"
 
 inherit autotools pkgconfig
diff --git a/packages/libgpepimc/libgpepimc-hildon_0.5.bb b/packages/libgpepimc/libgpepimc-hildon_0.5.bb
index 3442073573..9872228e6b 100644
--- a/packages/libgpepimc/libgpepimc-hildon_0.5.bb
+++ b/packages/libgpepimc/libgpepimc-hildon_0.5.bb
@@ -3,7 +3,6 @@ PR          = "r0"
 DESCRIPTION = "Common code for GPE PIMs (hildon UI version)"
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
-MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 DEPENDS     = "libgpewidget-hildon gtk+ sqlite hildon-lgpl"
 PROVIDES    = "libgepepimc"
 RPROVIDES   = "libgepepimc"
diff --git a/packages/libgpepimc/libgpepimc.inc b/packages/libgpepimc/libgpepimc.inc
index 8d0711e67c..8894ff6fe3 100644
--- a/packages/libgpepimc/libgpepimc.inc
+++ b/packages/libgpepimc/libgpepimc.inc
@@ -3,7 +3,6 @@ PR          = "r0"
 DESCRIPTION = "Common code for GPE PIMs"
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
-MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 DEPENDS     = "libgpewidget gtk+ sqlite"
 PROVIDES    = "libgepepimc"
 RPROVIDES   = "libgepepimc"
diff --git a/packages/libgpepimc/libgpepimc_0.2.bb b/packages/libgpepimc/libgpepimc_0.2.bb
index c189aeaa18..be71eaa371 100644
--- a/packages/libgpepimc/libgpepimc_0.2.bb
+++ b/packages/libgpepimc/libgpepimc_0.2.bb
@@ -2,7 +2,6 @@ LICENSE = "LGPL"
 DESCRIPTION = "Common code for GPE PIMs"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "libgpewidget libdisplaymigration gtk+ sqlite"
 
 inherit pkgconfig gpe
diff --git a/packages/libgpepimc/libgpepimc_0.3.bb b/packages/libgpepimc/libgpepimc_0.3.bb
index 3e178cc91b..8115c689cf 100644
--- a/packages/libgpepimc/libgpepimc_0.3.bb
+++ b/packages/libgpepimc/libgpepimc_0.3.bb
@@ -2,7 +2,6 @@ LICENSE = "LGPL"
 DESCRIPTION = "Common code for GPE PIMs"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "libgpewidget libdisplaymigration gtk+ sqlite"
 
 inherit pkgconfig gpe
diff --git a/packages/libgpepimc/libgpepimc_0.4.bb b/packages/libgpepimc/libgpepimc_0.4.bb
index 3e178cc91b..8115c689cf 100644
--- a/packages/libgpepimc/libgpepimc_0.4.bb
+++ b/packages/libgpepimc/libgpepimc_0.4.bb
@@ -2,7 +2,6 @@ LICENSE = "LGPL"
 DESCRIPTION = "Common code for GPE PIMs"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "libgpewidget libdisplaymigration gtk+ sqlite"
 
 inherit pkgconfig gpe
diff --git a/packages/libgpeplugin/libgpeplugin_cvs.bb b/packages/libgpeplugin/libgpeplugin_cvs.bb
index ebadfb48a7..a5092ec806 100644
--- a/packages/libgpeplugin/libgpeplugin_cvs.bb
+++ b/packages/libgpeplugin/libgpeplugin_cvs.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Plugin system for GPE applications"
 AUTHOR = "Luce DeCicco <ldecicco@gmail.com>"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = "gtk+ libgpewidget"
 PV = "0.0+cvs${SRCDATE}"
diff --git a/packages/libgpevtype/libgpevtype_0.15.bb b/packages/libgpevtype/libgpevtype_0.15.bb
index a2639f448c..5f5de2eda3 100644
--- a/packages/libgpevtype/libgpevtype_0.15.bb
+++ b/packages/libgpevtype/libgpevtype_0.15.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Data interchange library for GPE"
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "libmimedir libeventdb"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>
 PR          = "r0"
 
 inherit pkgconfig gpe autotools
diff --git a/packages/libgpevtype/libgpevtype_0.16.bb b/packages/libgpevtype/libgpevtype_0.16.bb
index a2639f448c..5f5de2eda3 100644
--- a/packages/libgpevtype/libgpevtype_0.16.bb
+++ b/packages/libgpevtype/libgpevtype_0.16.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Data interchange library for GPE"
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "libmimedir libeventdb"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>
 PR          = "r0"
 
 inherit pkgconfig gpe autotools
diff --git a/packages/libgpevtype/libgpevtype_0.17.bb b/packages/libgpevtype/libgpevtype_0.17.bb
index 38e8f3d7b2..33389233ef 100644
--- a/packages/libgpevtype/libgpevtype_0.17.bb
+++ b/packages/libgpevtype/libgpevtype_0.17.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Data interchange library for GPE"
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "libmimedir libeventdb"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>
 PR          = "r0"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb
index 27714b8f6d..6316ba67f6 100644
--- a/packages/libgpevtype/libgpevtype_cvs.bb
+++ b/packages/libgpevtype/libgpevtype_cvs.bb
@@ -2,7 +2,6 @@ LICENSE = 	"LGPL"
 DESCRIPTION = 	"Data interchange library for GPE"
 SECTION = 	"gpe/libs"
 PRIORITY = 	"optional"
-MAINTAINER = 	"Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = 	"libmimedir"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/libgpewidget/libgpewidget-hildon_0.102.bb b/packages/libgpewidget/libgpewidget-hildon_0.102.bb
index 0cce030663..6327341160 100644
--- a/packages/libgpewidget/libgpewidget-hildon_0.102.bb
+++ b/packages/libgpewidget/libgpewidget-hildon_0.102.bb
@@ -3,7 +3,6 @@ PR          = "r0"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
-MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 DEPENDS     = "gtk+ libxrender gtk-doc intltool-native sdk-default-icons"
 RDEPENDS    = "sdk-default-icons"
 PROVIDES    = "libgpewidget"
diff --git a/packages/libgpewidget/libgpewidget_0.110.bb b/packages/libgpewidget/libgpewidget_0.110.bb
index 780d1e920b..4c69249870 100644
--- a/packages/libgpewidget/libgpewidget_0.110.bb
+++ b/packages/libgpewidget/libgpewidget_0.110.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ cairo libxrender gtk-doc"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/libgpewidget/libgpewidget_0.111.bb b/packages/libgpewidget/libgpewidget_0.111.bb
index 780d1e920b..4c69249870 100644
--- a/packages/libgpewidget/libgpewidget_0.111.bb
+++ b/packages/libgpewidget/libgpewidget_0.111.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ cairo libxrender gtk-doc"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/libgpewidget/libgpewidget_0.112.bb b/packages/libgpewidget/libgpewidget_0.112.bb
index 780d1e920b..4c69249870 100644
--- a/packages/libgpewidget/libgpewidget_0.112.bb
+++ b/packages/libgpewidget/libgpewidget_0.112.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ cairo libxrender gtk-doc"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/libgpewidget/libgpewidget_0.113.bb b/packages/libgpewidget/libgpewidget_0.113.bb
index 21ab29bff6..dcc2deb337 100644
--- a/packages/libgpewidget/libgpewidget_0.113.bb
+++ b/packages/libgpewidget/libgpewidget_0.113.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ cairo libxrender gtk-doc"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/libgpewidget/libgpewidget_0.114.bb b/packages/libgpewidget/libgpewidget_0.114.bb
index 21ab29bff6..dcc2deb337 100644
--- a/packages/libgpewidget/libgpewidget_0.114.bb
+++ b/packages/libgpewidget/libgpewidget_0.114.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ cairo libxrender gtk-doc"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb
index e321d51c7d..1eeea30e59 100644
--- a/packages/libgpewidget/libgpewidget_cvs.bb
+++ b/packages/libgpewidget/libgpewidget_cvs.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ cairo libxrender gtk-doc"
 
 
diff --git a/packages/libgsm/libgsm_1.0.10.bb b/packages/libgsm/libgsm_1.0.10.bb
index e52dcc526d..7b83c225df 100644
--- a/packages/libgsm/libgsm_1.0.10.bb
+++ b/packages/libgsm/libgsm_1.0.10.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "GSM Audio Library"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Luca De Cicco <ldecicco@gmx.net>"
 #DEPENDS = ""
 LICENSE = "libgsm"
 inherit pkgconfig gpe
diff --git a/packages/libgtkstylus/libgtkstylus_0.1.bb b/packages/libgtkstylus/libgtkstylus_0.1.bb
index 940eac5f38..cc624a4684 100644
--- a/packages/libgtkstylus/libgtkstylus_0.1.bb
+++ b/packages/libgtkstylus/libgtkstylus_0.1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "GTK plugin for stylus based systems"
 SECTION = "libs"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+"
 PR = "r1"
 LICENSE = "LGPL"
diff --git a/packages/libgtkstylus/libgtkstylus_0.3.bb b/packages/libgtkstylus/libgtkstylus_0.3.bb
index 31cfdf4495..3f5bc12a96 100644
--- a/packages/libgtkstylus/libgtkstylus_0.3.bb
+++ b/packages/libgtkstylus/libgtkstylus_0.3.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "GTK plugin for stylus based systems"
 SECTION = "libs"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 DEPENDS = "gtk+"
 LICENSE = "LGPL"
 FILES_${PN} = "/etc ${libdir}/gtk-2.0/2.4.0/modules/*.so*"
diff --git a/packages/libhal-nm/libhal-nm_0.0.2.bb b/packages/libhal-nm/libhal-nm_0.0.2.bb
index 59c7d93217..60bcca07b9 100644
--- a/packages/libhal-nm/libhal-nm_0.0.2.bb
+++ b/packages/libhal-nm/libhal-nm_0.0.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A library emulating libhal on systems where HAL cannot run"
 SECTION = "libs"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.handhelds.org/~mmp"
-MAINTAINER = "Milan Plzik <mmp@handhelds.org>"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0"
 SRC_URI = "http://www.handhelds.org/~mmp/files/libhal-nm-${PV}.tar.gz"
diff --git a/packages/libhandoff/libhandoff_cvs.bb b/packages/libhandoff/libhandoff_cvs.bb
index 2a1b70852d..a7b0c144ab 100644
--- a/packages/libhandoff/libhandoff_cvs.bb
+++ b/packages/libhandoff/libhandoff_cvs.bb
@@ -5,7 +5,6 @@ PRIORITY = "optional"
 DEPENDS  = "glib-2.0"
 PV = "0.1+cvs${SRCDATE}"
 PR = "r0"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEFAULT_PREFERENCE = "-1"
 
 inherit pkgconfig gpe autotools
diff --git a/packages/libiconv/libiconv_1.9.2.bb b/packages/libiconv/libiconv_1.9.2.bb
index 16a595ca6c..4f8f694e07 100644
--- a/packages/libiconv/libiconv_1.9.2.bb
+++ b/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/packages/libid3tag/libid3tag_0.15.0b.bb b/packages/libid3tag/libid3tag_0.15.0b.bb
index e47c00e76f..840c7f8ae7 100644
--- a/packages/libid3tag/libid3tag_0.15.0b.bb
+++ b/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/packages/libmad/libmad_0.15.0b.bb b/packages/libmad/libmad_0.15.0b.bb
index b3614db05a..d6e6dda1d6 100644
--- a/packages/libmad/libmad_0.15.0b.bb
+++ b/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/packages/libmailwrapper/libmailwrapper.inc b/packages/libmailwrapper/libmailwrapper.inc
index ac39a4ad1a..e8e8995f7f 100644
--- a/packages/libmailwrapper/libmailwrapper.inc
+++ b/packages/libmailwrapper/libmailwrapper.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Qt-based class wrapper of libetpan"
 SECTION = "opie/libs"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "LGPL"
 DEPENDS = "libetpan"
 
diff --git a/packages/libmpeg2/libmpeg2_0.4.0b.bb b/packages/libmpeg2/libmpeg2_0.4.0b.bb
index 3fa46f1f24..74b1ef8c38 100644
--- a/packages/libmpeg2/libmpeg2_0.4.0b.bb
+++ b/packages/libmpeg2/libmpeg2_0.4.0b.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "MPEG Video Decoder Library"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Tim Ansell <ipks@mithis.net>"
 DEPENDS = "virtual/libsdl"
 LICENSE = "GPL"
 
diff --git a/packages/libnl/libnl_1.0-pre6.bb b/packages/libnl/libnl_1.0-pre6.bb
index beac3f732e..2509b37c4e 100644
--- a/packages/libnl/libnl_1.0-pre6.bb
+++ b/packages/libnl/libnl_1.0-pre6.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "libnl is a library for applications dealing with netlink sockets"
 SECTION = "libs/network"
 LICENSE = "LGPL"
 HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
-MAINTAINER = "Milan Plzik <mmp@handhelds.org>"
 PRIORITY = "optional"
 PV = "0.99+1.0-pre6"
 
diff --git a/packages/liboil/liboil_0.3.9.bb b/packages/liboil/liboil_0.3.9.bb
index 04a83100b0..94471a26fc 100644
--- a/packages/liboil/liboil_0.3.9.bb
+++ b/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>"
 
 SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz"
 
diff --git a/packages/libol/libol_0.3.16.bb b/packages/libol/libol_0.3.16.bb
index be308f1153..1f11d8371c 100644
--- a/packages/libol/libol_0.3.16.bb
+++ b/packages/libol/libol_0.3.16.bb
@@ -1,5 +1,4 @@
 PR = "r5"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 
 SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${PN}-${PV}.tar.gz"
 
diff --git a/packages/libol/libol_0.3.18.bb b/packages/libol/libol_0.3.18.bb
index 3412acfc9a..67677c864f 100644
--- a/packages/libol/libol_0.3.18.bb
+++ b/packages/libol/libol_0.3.18.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 PR = "r5"
 
 SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${PN}-${PV}.tar.gz"
diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index 390de9c9ad..9f488f346d 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Base libraries for the Open Palmtop Integrated Environment"
 HOMEPAGE = "http://opie.handhelds.org"
 SECTION = "opie/libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
 DEPENDS = "libqpe-opie libpcap sqlite3 bluez-libs"
diff --git a/packages/libopieobex/libopieobex0.inc b/packages/libopieobex/libopieobex0.inc
index 15640c530d..a93842f72c 100644
--- a/packages/libopieobex/libopieobex0.inc
+++ b/packages/libopieobex/libopieobex0.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "IrDA obex support library"
 SECTION = "opie/libs"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "LGPL"
 DEPENDS = "libopietooth1 opie-taskbar openobex-apps"
 RDEPENDS = "openobex-apps"
diff --git a/packages/libopietooth/libopietooth1.inc b/packages/libopietooth/libopietooth1.inc
index 4aad9fb05e..4b81f26cab 100644
--- a/packages/libopietooth/libopietooth1.inc
+++ b/packages/libopietooth/libopietooth1.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "Opie Bluetooth library"
 SECTION = "opie/libs"
 PRIORITY = "optional"
 DEPENDS = "libopie2"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "LGPL"
 
 
diff --git a/packages/libpcl/libpcl_1.4.bb b/packages/libpcl/libpcl_1.4.bb
index f0de653806..9fdf394894 100644
--- a/packages/libpcl/libpcl_1.4.bb
+++ b/packages/libpcl/libpcl_1.4.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "The Portable Coroutine Library (PCL) implements the low level \
 functionality for coroutines."
 HOMEPAGE = "http://www.xmailserver.org/libpcl.html"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "libs"
 
 SRC_URI = "http://www.xmailserver.org/libpcl-${PV}.tar.gz"
diff --git a/packages/libpixman/libpixman_0.1.5.bb b/packages/libpixman/libpixman_0.1.5.bb
index 5f433e4619..a9bff9d2f6 100644
--- a/packages/libpixman/libpixman_0.1.5.bb
+++ b/packages/libpixman/libpixman_0.1.5.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "virtual/libx11"
 DESCRIPTION = "Cairo support library"
 LICENSE = "X11"
diff --git a/packages/libpixman/libpixman_0.1.6.bb b/packages/libpixman/libpixman_0.1.6.bb
index 5f433e4619..a9bff9d2f6 100644
--- a/packages/libpixman/libpixman_0.1.6.bb
+++ b/packages/libpixman/libpixman_0.1.6.bb
@@ -1,6 +1,5 @@
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "virtual/libx11"
 DESCRIPTION = "Cairo support library"
 LICENSE = "X11"
diff --git a/packages/libpixman/libpixman_cvs.bb b/packages/libpixman/libpixman_cvs.bb
index 0ed6ff7dd9..62ffdc94f3 100644
--- a/packages/libpixman/libpixman_cvs.bb
+++ b/packages/libpixman/libpixman_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "virtual/libx11"
 DESCRIPTION = "Cairo support library"
 LICENSE = "X11"
diff --git a/packages/libpng/libpng_1.2.12.bb b/packages/libpng/libpng_1.2.12.bb
index 2e7ac6e4e3..c3fdc12d0b 100644
--- a/packages/libpng/libpng_1.2.12.bb
+++ b/packages/libpng/libpng_1.2.12.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.libpng.org/"
 LICENSE = "libpng"
 SECTION = "libs"
 PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PR = "r5"
 
 DEPENDS = "zlib"
diff --git a/packages/libpng/libpng_1.2.8.bb b/packages/libpng/libpng_1.2.8.bb
index b1096779fa..d92bf35cc3 100644
--- a/packages/libpng/libpng_1.2.8.bb
+++ b/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/packages/libqanava/libqanava_0.0.7.bb b/packages/libqanava/libqanava_0.0.7.bb
index 13ab88c3d2..dbec5c7001 100644
--- a/packages/libqanava/libqanava_0.0.7.bb
+++ b/packages/libqanava/libqanava_0.0.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Qanava is a gtaph library based on the Qt4 Arthur framework."
 SECTION = "x11/libs"
 HOMEPAGE = "http://www.libqanava.org/"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 # LGPL after 0.0.7
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 57759a1681..6f989f9105 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.trolltech.com"
 AUTHOR = "The Trolls"
 SECTION = "opie/libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "uicmoc-native virtual/libqte2"
 PROVIDES = "virtual/libqpe1"
diff --git a/packages/libqtaux/libqtaux2.inc b/packages/libqtaux/libqtaux2.inc
index 3f34fba725..e06882424d 100644
--- a/packages/libqtaux/libqtaux2.inc
+++ b/packages/libqtaux/libqtaux2.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "Qt/Embedded 2 Auxilliary libraries"
 HOMEPAGE = "http://opie.handhelds.org"
 SECTION = "opie/libs"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 
 S = "${WORKDIR}/libqtaux"
diff --git a/packages/librewrite/librewrite_0.1.bb b/packages/librewrite/librewrite_0.1.bb
index 65290f22aa..44985f6960 100644
--- a/packages/librewrite/librewrite_0.1.bb
+++ b/packages/librewrite/librewrite_0.1.bb
@@ -1,7 +1,6 @@
 LICENSE = "LGPL"
 DESCRIPTION = "Application relocator library"
 SECTION = "libs"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 
 inherit autotools
 
diff --git a/packages/librsvg/librsvg_2.11.1.bb b/packages/librsvg/librsvg_2.11.1.bb
index e64e3097dc..4cddc1f2dd 100644
--- a/packages/librsvg/librsvg_2.11.1.bb
+++ b/packages/librsvg/librsvg_2.11.1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Library for rendering SVG files"
 SECTION = "x11/utils"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt"
 LICENSE = "LGPL"
 PR = "r1"
diff --git a/packages/librsvg/librsvg_2.6.5.bb b/packages/librsvg/librsvg_2.6.5.bb
index 59e8cecd28..e5b691a000 100644
--- a/packages/librsvg/librsvg_2.6.5.bb
+++ b/packages/librsvg/librsvg_2.6.5.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Library for rendering SVG files"
 SECTION = "x11/utils"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libart-lgpl libxml2 popt"
 LICENSE = "LGPL"
 PR = "r3"
diff --git a/packages/librsvg/librsvg_2.9.5.bb b/packages/librsvg/librsvg_2.9.5.bb
index 3fd4581453..a462390182 100644
--- a/packages/librsvg/librsvg_2.9.5.bb
+++ b/packages/librsvg/librsvg_2.9.5.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Library for rendering SVG files"
 SECTION = "x11/utils"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt"
 LICENSE = "LGPL"
 PR = "r3"
diff --git a/packages/libschedule/libschedule_0.14.bb b/packages/libschedule/libschedule_0.14.bb
index feba11c9df..11729b095e 100644
--- a/packages/libschedule/libschedule_0.14.bb
+++ b/packages/libschedule/libschedule_0.14.bb
@@ -3,7 +3,6 @@ PR = "r1"
 DESCRIPTION = "RTC alarm handling library for GPE"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0"
 
 inherit pkgconfig gpe
diff --git a/packages/libsdl/libsdl-gfx_2.0.11.bb b/packages/libsdl/libsdl-gfx_2.0.11.bb
index 96cf7c502d..712675771a 100644
--- a/packages/libsdl/libsdl-gfx_2.0.11.bb
+++ b/packages/libsdl/libsdl-gfx_2.0.11.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Simple DirectMedia Layer graphic primitives library."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "zlib libpng jpeg virtual/libsdl"
 LICENSE = "LGPL"
 
diff --git a/packages/libsdl/libsdl-image_1.2.3.bb b/packages/libsdl/libsdl-image_1.2.3.bb
index c8568473e4..b35aa3bf1e 100644
--- a/packages/libsdl/libsdl-image_1.2.3.bb
+++ b/packages/libsdl/libsdl-image_1.2.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Simple DirectMedia Layer image library."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "zlib libpng jpeg virtual/libsdl"
 LICENSE = "LGPL"
 
diff --git a/packages/libsdl/libsdl-mixer_1.2.6.bb b/packages/libsdl/libsdl-mixer_1.2.6.bb
index 3aafa18d0c..ffc1c6956f 100644
--- a/packages/libsdl/libsdl-mixer_1.2.6.bb
+++ b/packages/libsdl/libsdl-mixer_1.2.6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Simple DirectMedia Layer mixer library."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "virtual/libsdl"
 LICENSE = "LGPL"
 PR = "r1"
diff --git a/packages/libsdl/libsdl-net_1.2.5.bb b/packages/libsdl/libsdl-net_1.2.5.bb
index 1e5f9f81c2..a2ab06d479 100644
--- a/packages/libsdl/libsdl-net_1.2.5.bb
+++ b/packages/libsdl/libsdl-net_1.2.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Simple DirectMedia Layer networking library."
 SECTION = "libs/network"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "virtual/libsdl"
 LICENSE = "LGPL"
 
diff --git a/packages/libsdl/libsdl-qpe_1.2.7.bb b/packages/libsdl/libsdl-qpe_1.2.7.bb
index b87685b913..60c2a9d385 100644
--- a/packages/libsdl/libsdl-qpe_1.2.7.bb
+++ b/packages/libsdl/libsdl-qpe_1.2.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Simple DirectMedia Layer - QtE-based Palmtop Environments Edition"
 SECTION = "opie/libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "virtual/libqpe1 libopie2"
 PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
diff --git a/packages/libsdl/libsdl-ttf_2.0.3.bb b/packages/libsdl/libsdl-ttf_2.0.3.bb
index 6099021f88..59e9174fac 100644
--- a/packages/libsdl/libsdl-ttf_2.0.3.bb
+++ b/packages/libsdl/libsdl-ttf_2.0.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Simple DirectMedia Layer truetype font library."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "virtual/libsdl freetype"
 LICENSE = "LGPL"
 
diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb
index 6c75068c09..125aec5f36 100644
--- a/packages/libsdl/libsdl-x11_1.2.7.bb
+++ b/packages/libsdl/libsdl-x11_1.2.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "virtual/libx11 libxext"
 PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
diff --git a/packages/libsexy/libsexy_0.1.4.bb b/packages/libsexy/libsexy_0.1.4.bb
index f6d5cbc600..b3e7e7ad7d 100644
--- a/packages/libsexy/libsexy_0.1.4.bb
+++ b/packages/libsexy/libsexy_0.1.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
 HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
 AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>""
 PR = "r1"
 
 DEPENDS = "gtk+ enchant libxml2"
diff --git a/packages/libsexy/libsexy_0.1.5.bb b/packages/libsexy/libsexy_0.1.5.bb
index e2c63a6648..964c381c7d 100644
--- a/packages/libsexy/libsexy_0.1.5.bb
+++ b/packages/libsexy/libsexy_0.1.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
 HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
 AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>""
 PR = "r0"
 
 DEPENDS = "gtk+ enchant libxml2"
diff --git a/packages/libsexy/libsexy_0.1.6.bb b/packages/libsexy/libsexy_0.1.6.bb
index e2c63a6648..964c381c7d 100644
--- a/packages/libsexy/libsexy_0.1.6.bb
+++ b/packages/libsexy/libsexy_0.1.6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
 HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
 AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>""
 PR = "r0"
 
 DEPENDS = "gtk+ enchant libxml2"
diff --git a/packages/libsexy/libsexy_0.1.8.bb b/packages/libsexy/libsexy_0.1.8.bb
index 123b6dd445..1de4a9175a 100644
--- a/packages/libsexy/libsexy_0.1.8.bb
+++ b/packages/libsexy/libsexy_0.1.8.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functiona
 HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
 AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
 SECTION = "x11/libs"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>""
 PR = "r1"
 
 DEPENDS = "gtk+ enchant libxml2"
diff --git a/packages/libsndfile/libsndfile1_1.0.16.bb b/packages/libsndfile/libsndfile1_1.0.16.bb
index fb3ed30f38..5dbec09411 100644
--- a/packages/libsndfile/libsndfile1_1.0.16.bb
+++ b/packages/libsndfile/libsndfile1_1.0.16.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "An audio format Conversion library"
 HOMEPAGE = "http://www.mega-nerd.com/libsndfile"
 AUTHOR = "Erik de Castro Lopo"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "libs/multimedia"
 LICENSE = "LGPL"
 PR = "r1"
diff --git a/packages/libspf2/libspf2_1.0.4.bb b/packages/libspf2/libspf2_1.0.4.bb
index 22b94a8d00..8254d25f7c 100644
--- a/packages/libspf2/libspf2_1.0.4.bb
+++ b/packages/libspf2/libspf2_1.0.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "libspf2 is a complete and robust implementation of SPF which \
 provides support for many MTAs."
 SECTION = "libs/network"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPL"
 SRC_URI = "http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 S = "${WORKDIR}/libspf2-${PV}"
diff --git a/packages/libtododb/libtododb_0.07.bb b/packages/libtododb/libtododb_0.07.bb
index 180481fd61..c71e5db1e1 100644
--- a/packages/libtododb/libtododb_0.07.bb
+++ b/packages/libtododb/libtododb_0.07.bb
@@ -2,7 +2,6 @@ LICENSE = "LGPL"
 DESCRIPTION = "Database access for GPE to-do list"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "libgpewidget libgpepimc sqlite"
 
 inherit pkgconfig gpe
diff --git a/packages/libtododb/libtododb_0.08.bb b/packages/libtododb/libtododb_0.08.bb
index 180481fd61..c71e5db1e1 100644
--- a/packages/libtododb/libtododb_0.08.bb
+++ b/packages/libtododb/libtododb_0.08.bb
@@ -2,7 +2,6 @@ LICENSE = "LGPL"
 DESCRIPTION = "Database access for GPE to-do list"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "libgpewidget libgpepimc sqlite"
 
 inherit pkgconfig gpe
diff --git a/packages/libtododb/libtododb_0.09.bb b/packages/libtododb/libtododb_0.09.bb
index 56a9f2cbc3..01fe358085 100644
--- a/packages/libtododb/libtododb_0.09.bb
+++ b/packages/libtododb/libtododb_0.09.bb
@@ -2,7 +2,6 @@ LICENSE = "LGPL"
 DESCRIPTION = "Database access for GPE to-do list"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "libgpewidget libgpepimc sqlite"
 
 
diff --git a/packages/libtododb/libtododb_0.10.bb b/packages/libtododb/libtododb_0.10.bb
index abc1addaeb..bb6f95a5b1 100644
--- a/packages/libtododb/libtododb_0.10.bb
+++ b/packages/libtododb/libtododb_0.10.bb
@@ -2,7 +2,6 @@ LICENSE = "LGPL"
 DESCRIPTION = "Database access for GPE to-do list"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "libgpewidget libgpepimc sqlite"
 
 GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/libvncserver/libvncserver_0.8.2.bb b/packages/libvncserver/libvncserver_0.8.2.bb
index 8ceec7e62a..188b22a14e 100644
--- a/packages/libvncserver/libvncserver_0.8.2.bb
+++ b/packages/libvncserver/libvncserver_0.8.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A library to support implementations of RDP/VNC servers"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://sourceforge.net/projects/libvncserver"
 AUTHOR = "Johannes Schindelin <dscho@users.sourceforge.net>"
-MAINTAINER = "Patrik Gfeller <gfellerpatrik@gmx.net>"
 SECTION = "libs"
 PRIORITY = "optional"
 PROVIDES = "x11vnc"
diff --git a/packages/libwpd/libwpd_0.8.4.bb b/packages/libwpd/libwpd_0.8.4.bb
index 9be164437d..46a59e8dc8 100644
--- a/packages/libwpd/libwpd_0.8.4.bb
+++ b/packages/libwpd/libwpd_0.8.4.bb
@@ -1,7 +1,6 @@
 LICENSE = "LGPL"
 DESCRIPTION = "libwpd is a C++ library designed to help process WordPerfect documents."
 HOMEPAGE = "http://libwpd.sourceforge.net/index.html"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
 
diff --git a/packages/libwpd/libwpd_0.8.6.bb b/packages/libwpd/libwpd_0.8.6.bb
index 9be164437d..46a59e8dc8 100644
--- a/packages/libwpd/libwpd_0.8.6.bb
+++ b/packages/libwpd/libwpd_0.8.6.bb
@@ -1,7 +1,6 @@
 LICENSE = "LGPL"
 DESCRIPTION = "libwpd is a C++ library designed to help process WordPerfect documents."
 HOMEPAGE = "http://libwpd.sourceforge.net/index.html"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
 
diff --git a/packages/libxml/libxml++_2.14.0.bb b/packages/libxml/libxml++_2.14.0.bb
index 6eb296c8c2..4a5af16ea3 100644
--- a/packages/libxml/libxml++_2.14.0.bb
+++ b/packages/libxml/libxml++_2.14.0.bb
@@ -1,5 +1,4 @@
 LICENSE = "GPL"
-MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 
 DEPENDS = "gtk+"
 
diff --git a/packages/libxml/libxml2-native_2.6.10.bb b/packages/libxml/libxml2-native_2.6.10.bb
index 1a387c4d81..dcbb181de4 100644
--- a/packages/libxml/libxml2-native_2.6.10.bb
+++ b/packages/libxml/libxml2-native_2.6.10.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "GNOME XML library"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz"
 
diff --git a/packages/libxml/libxml2-native_2.6.9.bb b/packages/libxml/libxml2-native_2.6.9.bb
index 1a387c4d81..dcbb181de4 100644
--- a/packages/libxml/libxml2-native_2.6.9.bb
+++ b/packages/libxml/libxml2-native_2.6.9.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "GNOME XML library"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz"
 
diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb
index 7872a434b1..7707d91761 100644
--- a/packages/libxsettings-client/libxsettings-client_0.16.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.16.bb
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 DEPENDS = "libxsettings virtual/libx11 libxt"
 # libxt is required to stop configure breaking builds by 
 # including system paths to find it if it isn't present.
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 PR="r1"
 
 inherit autotools pkgconfig gpe
diff --git a/packages/libxsettings-client/libxsettings-client_0.17.bb b/packages/libxsettings-client/libxsettings-client_0.17.bb
index f25ca927ad..0643c5f14d 100644
--- a/packages/libxsettings-client/libxsettings-client_0.17.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.17.bb
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc"
 # libxt is required to stop configure breaking builds by 
 # including system paths to find it if it isn't present.
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 PR="r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
diff --git a/packages/libxsettings/libxsettings_0.11.bb b/packages/libxsettings/libxsettings_0.11.bb
index d3197a89c2..2d9a3657f9 100644
--- a/packages/libxsettings/libxsettings_0.11.bb
+++ b/packages/libxsettings/libxsettings_0.11.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Common code for XSETTINGS"
 SECTION = "gpe/libs"
 LICENSE = "BSD-X"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "virtual/libx11"
 
 inherit gpe
diff --git a/packages/lilo-sh/lilo-sh_21.bb b/packages/lilo-sh/lilo-sh_21.bb
index e1d1561e36..df8a755aee 100644
--- a/packages/lilo-sh/lilo-sh_21.bb
+++ b/packages/lilo-sh/lilo-sh_21.bb
@@ -11,7 +11,6 @@ a hard drive, boots the kernel, and passes control of the system to \
 the kernel. LILO can also boot other operating systems. LILO-sh is a \
 port of LILO to the SH processor."
 SECTION = "bootloaders"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "MIT"
 PR = "r0"
 
diff --git a/packages/lineak/lineak_0.8.3.bb b/packages/lineak/lineak_0.8.3.bb
index 78580d6f1a..d26ef7bb56 100644
--- a/packages/lineak/lineak_0.8.3.bb
+++ b/packages/lineak/lineak_0.8.3.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "lineakd"
 SECTION = "gpe/multimedia"
 HOMEPAGE = "http://lineak.sourceforge.net"
 LICENSE = "GPLv2"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 DEPENDS = "virtual/libx11 libxext"
 PR = "r0"
 
diff --git a/packages/links/links-x11_2.1pre23.bb b/packages/links/links-x11_2.1pre23.bb
index c68a94565b..ba9e531ca2 100644
--- a/packages/links/links-x11_2.1pre23.bb
+++ b/packages/links/links-x11_2.1pre23.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Links is graphics and text mode WWW \
 browser, similar to Lynx."
 HOMEPAGE = "http://links.twibright.com/"
 SECTION = "console/network"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 LICENSE = "GPL"
 DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11"
 RCONFLICTS = "links"
diff --git a/packages/links/links_2.1pre23.bb b/packages/links/links_2.1pre23.bb
index 4838ce37c0..d8519950c6 100644
--- a/packages/links/links_2.1pre23.bb
+++ b/packages/links/links_2.1pre23.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Links is graphics and text mode WWW \
 browser, similar to Lynx."
 HOMEPAGE = "http://links.twibright.com/"
 SECTION = "console/network"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 LICENSE = "GPL"
 DEPENDS = "jpeg libpng gpm flex openssl zlib"
 RCONFLICTS="links-x11"
diff --git a/packages/linux-atm/linux-atm_2.4.1.bb b/packages/linux-atm/linux-atm_2.4.1.bb
index b293c4c346..ed88f3227b 100644
--- a/packages/linux-atm/linux-atm_2.4.1.bb
+++ b/packages/linux-atm/linux-atm_2.4.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Drivers and tools to support ATM networking under Linux"
 HOMEPAGE = "http://linux-atm.sourceforge.net/"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Rob Taylor <rjt@cambridgebroadband.com>"
 DEPENDS = "virtual/kernel"
 PR = "r1"
 LICENSE = "GPL LGPL"
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
index 2f471223e6..c43664094d 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
+++ b/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/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
index 6a9d81916e..1b0296c494 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
@@ -1,6 +1,5 @@
 SECTION = "devel"
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 INHIBIT_DEFAULT_DEPS = "1"
 PR = "r3"
 LICENSE = "GPL"
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
index 9e72bc4b25..cb04c92192 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.8.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 = "r7"
 
diff --git a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
index b7ef49c0f4..848bb709e8 100644
--- a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
+++ b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "User Mode Linux Kernel"
 SECTION = "kernel"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 RCV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
diff --git a/packages/linux/LAB-kernel_2.6.13-hh2.bb b/packages/linux/LAB-kernel_2.6.13-hh2.bb
index 3a32616d45..af177ba62e 100644
--- a/packages/linux/LAB-kernel_2.6.13-hh2.bb
+++ b/packages/linux/LAB-kernel_2.6.13-hh2.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "Liux As Bootloader kernelm"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPL"
 
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb
index aa393af203..1531e16149 100644
--- a/packages/linux/LAB-kernel_cvs.bb
+++ b/packages/linux/LAB-kernel_cvs.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "Liux As Bootloader kernelm"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPL"
 PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
 
diff --git a/packages/linux/collie-kernels-2.4-embedix.bb b/packages/linux/collie-kernels-2.4-embedix.bb
index 037d6ffc21..f53e86f6c4 100644
--- a/packages/linux/collie-kernels-2.4-embedix.bb
+++ b/packages/linux/collie-kernels-2.4-embedix.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Build all collie kernels in one go"
 SECTION = "kernel"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 LICENSE = "GPL"
 PROVIDES = "virtual/kernel"
 PR = "r2"
diff --git a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
index 5df470af1d..5c257eae47 100644
--- a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
+++ b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
@@ -1,7 +1,6 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the BSQUARE PXA255 DevKitIDP"
 LICENSE = "GPL"
-MAINTAINER = "<support@bsquare.com>"
 PR = "r2"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
diff --git a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
index a713707a73..ed76a38518 100644
--- a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
+++ b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines"
 SECTION = "kernel"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb b/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb
index 374936deea..c96af82fe9 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 #
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb
index 737a7970dc..55663a1260 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 #
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb
index 4c7a1bba52..595e28e0d2 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 PR="r1"
 #
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb
index 2c01ca91f8..e85687758e 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index 415559ec81..1b66acd492 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
 PR = "r4"
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb
index 2d9eccfd83..a194046528 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
index d0b2afe75d..bc5d2e50ef 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 PR = "r7"
 
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
index 034f2ca055..b752266d14 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 PR = "r4"
 
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb
index 6bf75de349..e6245c9583 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb
index 7bdb445312..f4c29dc719 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
index d3733b3e70..12b4e3d857 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
index f278af0185..4a5fb5ae02 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
index bed92aa6ea..0f4e7d4cba 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
index b39cb50835..34fcdd658a 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
 #PR = "r1"
 
diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb
index 41cab94908..dc8b8478a7 100644
--- a/packages/linux/handhelds-sa-2.6_cvs.bb
+++ b/packages/linux/handhelds-sa-2.6_cvs.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-MAINTAINER = "Alex Lange <chicken@handhelds.org>"
 LICENSE = "GPL"
 #
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
index 9e53e0394c..269f09022b 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "GPL"
 PR = "r3"
 
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
index 9dc6f5fa50..92937d97ce 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "GPL"
 PR = "r3"
 
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
index 240e52ccc2..8da6da5a23 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "GPL"
 PR = "r6"
 
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
index a3d54d1319..adca8740de 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "GPL"
 PR = "r0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb
index a3d54d1319..adca8740de 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "GPL"
 PR = "r0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/handhelds-un-2.6_2.6.16-hh4.bb b/packages/linux/handhelds-un-2.6_2.6.16-hh4.bb
index bf646a1c96..b81129eff9 100644
--- a/packages/linux/handhelds-un-2.6_2.6.16-hh4.bb
+++ b/packages/linux/handhelds-un-2.6_2.6.16-hh4.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Handhelds HTC-PXA phones kernel based on the hh 2.6.16"
-MAINTAINER = "goxboxlive <goxboxlive@gmail.com>"
 LICENSE = "GPL"
 PR="r0"
 
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 1a8dee7a4d..279b8fa57f 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -25,7 +25,6 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Intel IXP4xx device"
 LICENSE = "GPL"
-MAINTAINER = "NSLU2-Linux <www.nslu2-linux.org>"
 
 # Linux kernel source has the general form linux-X.Y.Z-patchP,
 # X.Y is the major version number, Z (which may have multiple
diff --git a/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb b/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
index 1948dedf65..9a80ce626f 100644
--- a/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
+++ b/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
@@ -1,7 +1,6 @@
 SECTION = "kernel"
 DESCRIPTION = "2.6 Linux kernel for the Amstrad Delta (E3)"
 LICENSE = "GPL"
-MAINTAINER = "Jonathan McDowell <noodles@earth.li>"
 
 COMPATIBLE_MACHINE = "amsdelta"
 
diff --git a/packages/linux/linux-efika_2.6.16.bb b/packages/linux/linux-efika_2.6.16.bb
index 1e43baca56..698e7434d7 100644
--- a/packages/linux/linux-efika_2.6.16.bb
+++ b/packages/linux/linux-efika_2.6.16.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
 SECTION = "kernel"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index d49f69eaea..7489421cee 100644
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
 SECTION = "kernel"
 AUTHOR = "Harald Welte and the OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
 LICENSE = "GPL"
 DEPENDS += "quilt-native"
 EZX = "ezx7"
diff --git a/packages/linux/linux-geodelx_2.6.11.bb b/packages/linux/linux-geodelx_2.6.11.bb
index f5b4f622b2..1810862b3b 100644
--- a/packages/linux/linux-geodelx_2.6.11.bb
+++ b/packages/linux/linux-geodelx_2.6.11.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION = "Linux kernel for the AMD Geode GX5535/LX5536"
 HOMEPAGE = "http://www.amd.com/embedded"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
 
 PR = "r0"
diff --git a/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb b/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb
index 4d2dfd40dd..7ad662a1df 100644
--- a/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb
+++ b/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for h1940 devices."
-MAINTAINER = "Arjan Schrijver <arjan@anymore.nl>"
 SECTION = "kernel"
 LICENSE = "GPL"
 
diff --git a/packages/linux/linux-h1940_2.6.14-h1940.bb b/packages/linux/linux-h1940_2.6.14-h1940.bb
index 998f3a180c..71829a36eb 100644
--- a/packages/linux/linux-h1940_2.6.14-h1940.bb
+++ b/packages/linux/linux-h1940_2.6.14-h1940.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for h1940 devices."
-MAINTAINER = "Arjan Schrijver <arjan@anymore.nl>"
 SECTION = "kernel"
 LICENSE = "GPL"
 
diff --git a/packages/linux/linux-h1940_2.6.17-h1940.bb b/packages/linux/linux-h1940_2.6.17-h1940.bb
index 3dd1f7733d..40a0efae12 100644
--- a/packages/linux/linux-h1940_2.6.17-h1940.bb
+++ b/packages/linux/linux-h1940_2.6.17-h1940.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for h1940 devices."
-MAINTAINER = "Arjan Schrijver <arjan@anymore.nl>"
 SECTION = "kernel"
 LICENSE = "GPL"
 
diff --git a/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb b/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb
index 51210c41f6..18f9036d9d 100644
--- a/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb
+++ b/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for h6300 devices."
-MAINTAINER = "Mika Laitio <lamikr@cc.jyu.fi>"
 SECTION = "kernel"
 LICENSE = "GPL"
 
diff --git a/packages/linux/linux-h6300-omap1_2.6.14.3.bb b/packages/linux/linux-h6300-omap1_2.6.14.3.bb
index 3e40f1278a..4f5e4dc924 100644
--- a/packages/linux/linux-h6300-omap1_2.6.14.3.bb
+++ b/packages/linux/linux-h6300-omap1_2.6.14.3.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for h6300 devices."
-MAINTAINER = "Mika Laitio <lamikr@cc.jyu.fi>"
 SECTION = "kernel"
 LICENSE = "GPL"
 
diff --git a/packages/linux/linux-h6300-omap1_2.6.16.16.bb b/packages/linux/linux-h6300-omap1_2.6.16.16.bb
index e270cd87a2..28aaadd107 100644
--- a/packages/linux/linux-h6300-omap1_2.6.16.16.bb
+++ b/packages/linux/linux-h6300-omap1_2.6.16.16.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for HP iPAQ h6300 series OMAP1510 based phones."
-MAINTAINER = "Mika Laitio <lamikr@cc.jyu.fi>"
 SECTION = "kernel"
 LICENSE = "GPL"
 
diff --git a/packages/linux/linux-ks8695_2.6.16.bb b/packages/linux/linux-ks8695_2.6.16.bb
index 8c3b694e7e..176b1fcbdb 100644
--- a/packages/linux/linux-ks8695_2.6.16.bb
+++ b/packages/linux/linux-ks8695_2.6.16.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Linux kernel for Micrel KS8695(P) based devices"
 SECTION = "kernel"
 LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
diff --git a/packages/linux/linux-mtx-1_2.4.27.bb b/packages/linux/linux-mtx-1_2.4.27.bb
index 0c907d6427..e46c3c723d 100644
--- a/packages/linux/linux-mtx-1_2.4.27.bb
+++ b/packages/linux/linux-mtx-1_2.4.27.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 HOMEPAGE = "http://meshcube.org/meshwiki/"
 LICENSE = "GPL"
 KV = "${PV}"
diff --git a/packages/linux/linux-mtx-2_2.4.27.bb b/packages/linux/linux-mtx-2_2.4.27.bb
index b08b3dcaeb..874fcd7f73 100644
--- a/packages/linux/linux-mtx-2_2.4.27.bb
+++ b/packages/linux/linux-mtx-2_2.4.27.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for MTX-2 (Surfbox2)"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 HOMEPAGE = "http://meshcube.org/meshwiki/"
 LICENSE = "GPL"
 KV = "${PV}"
diff --git a/packages/linux/linux-netvista_2.4.27.bb b/packages/linux/linux-netvista_2.4.27.bb
index 10c9bfc203..75c3943f62 100644
--- a/packages/linux/linux-netvista_2.4.27.bb
+++ b/packages/linux/linux-netvista_2.4.27.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Linux kernel x86 for IBM Netvista"
 LICENSE     = "GPL"
-MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>
 PR          = "r4"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index 809e065bcd..5c9536170f 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -1,6 +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"
diff --git a/packages/linux/linux-titan-sh4_2.6.17.bb b/packages/linux/linux-titan-sh4_2.6.17.bb
index 17ea61baa4..027983a242 100644
--- a/packages/linux/linux-titan-sh4_2.6.17.bb
+++ b/packages/linux/linux-titan-sh4_2.6.17.bb
@@ -1,7 +1,6 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for SH4 based TITAN router appliance"
 LICENSE = "GPL"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>
 PR = "r2"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
diff --git a/packages/linux/linux-wrap-geode_2.6.17.bb b/packages/linux/linux-wrap-geode_2.6.17.bb
index d02aca79f7..7bf2c3ee1c 100644
--- a/packages/linux/linux-wrap-geode_2.6.17.bb
+++ b/packages/linux/linux-wrap-geode_2.6.17.bb
@@ -2,7 +2,6 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for PC-Engines WRAP which are \
 Geode SC1100 (i486) based wirless router appliance boards"
 LICENSE = "GPL"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>
 PR = "r0"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
diff --git a/packages/linux/linux-wrt-2.4.30/303-mppe-mppc b/packages/linux/linux-wrt-2.4.30/303-mppe-mppc
index 382b4623f2..44f7e18a17 100644
--- a/packages/linux/linux-wrt-2.4.30/303-mppe-mppc
+++ b/packages/linux/linux-wrt-2.4.30/303-mppe-mppc
@@ -1584,7 +1584,6 @@ diff -ruN linux-2.4.29.orig/include/linux/ppp-comp.h linux-2.4.29/include/linux/
 - *  ==FILEVERSION 980319==
 + *  ==FILEVERSION 20040509==
   *
-  *  NOTE TO MAINTAINERS:
   *     If you modify this file at all, please set the above date.
 @@ -78,7 +78,7 @@
  
diff --git a/packages/linux/linux-wrt_2.4.20.bb b/packages/linux/linux-wrt_2.4.20.bb
index 32361b7810..830720f655 100644
--- a/packages/linux/linux-wrt_2.4.20.bb
+++ b/packages/linux/linux-wrt_2.4.20.bb
@@ -1,7 +1,6 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Linksys WRT54 devices"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.20.tar.bz2 \
diff --git a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
index b380632740..18af8276bc 100644
--- a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
+++ b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
@@ -1,7 +1,6 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the LogicPD Zoom(PXA270 ref design)"
 LICENSE = "GPL"
-MAINTAINER = "Shane Volpe <shane.volpe@gmail.com>"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.17-rc5.tar.bz2 \
diff --git a/packages/linux/mainstone-kernel_2.6.11.bb b/packages/linux/mainstone-kernel_2.6.11.bb
index 0e242c2dc8..9f25af51da 100644
--- a/packages/linux/mainstone-kernel_2.6.11.bb
+++ b/packages/linux/mainstone-kernel_2.6.11.bb
@@ -1,7 +1,6 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
 LICENSE = "GPL"
-MAINTAINER = "Cliff Brake <cliff.brake@gmail.com>"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb
index d17b6097b8..8aa327f1d2 100644
--- a/packages/linux/mainstone-kernel_2.6.18.bb
+++ b/packages/linux/mainstone-kernel_2.6.18.bb
@@ -1,7 +1,6 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
 LICENSE = "GPL"
-MAINTAINER = "Cliff Brake <cliff.brake@gmail.com>"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index 76e1769e31..3df8b1af99 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for MNCI device"
-MAINTAINER = "M&N Solutions <info@mn-solutions.de>"
 LICENSE = "GPL"
 DEPENDS = "modutils-cross virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}"
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/netbook-pro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb
index 0b5c11fcf3..564350e620 100644
--- a/packages/linux/netbook-pro-kernel_2.6.17.bb
+++ b/packages/linux/netbook-pro-kernel_2.6.17.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Linux Kernel for Psion/Teklogix netbookpro  compatible machines"
 SECTION = "kernel"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index bfae5f82d4..9cad4d76c0 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -28,7 +28,6 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Linksys NSLU2 device"
 LICENSE = "GPL"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 
 DEPENDS += "devio-native"
 
diff --git a/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c b/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c
index cc3b987575..fcb8566784 100644
--- a/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c
+++ b/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c
@@ -134,7 +134,6 @@ static void __init nslu2_init(void)
 }
 
 MACHINE_START(NSLU2, "Linksys NSLU2")
-        MAINTAINER("www.nslu2-linux.org")
 	        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, 
 			IXP4XX_PERIPHERAL_BASE_VIRT)
 	        MAPIO(nslu2_map_io)
diff --git a/packages/linux/nslu2-linksys-kernel_2.4.22.bb b/packages/linux/nslu2-linksys-kernel_2.4.22.bb
index de2715d107..8af30d09a3 100644
--- a/packages/linux/nslu2-linksys-kernel_2.4.22.bb
+++ b/packages/linux/nslu2-linksys-kernel_2.4.22.bb
@@ -1,7 +1,6 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Linksys NSLU2 device"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PR = "r2"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2 \
diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index 40cf007174..f826200e15 100644
--- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices."
-MAINTAINER = "Frederic Devernay <frederic.devernay@m4x.org>"
 SECTION = "kernel"
 LICENSE = "GPL"
 KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
index 51fabecd75..99613886ca 100644
--- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices."
-MAINTAINER = "Frederic Devernay <frederic.devernay@m4x.org>"
 SECTION = "kernel"
 LICENSE = "GPL"
 KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index 04f8342165..6c02395794 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices."
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "kernel"
 LICENSE = "GPL"
 PV = "2.4.18-rmk7-pxa3-embedix"
diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb
index e42dfa2ae9..f8c1917ab9 100644
--- a/packages/linux/triton-kernel_2.6.11.bb
+++ b/packages/linux/triton-kernel_2.6.11.bb
@@ -1,7 +1,6 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the KARO TRITON XScale Board"
 LICENSE = "GPL"
-MAINTAINER = "Justin Huff <jjhuff@mspin.net"
 PR = "r0"
 
 KERNEL_SUFFIX = "triton"
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index d9c7f4ed68..3043992d83 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -3,7 +3,6 @@ SECTION = "kernel"
 require nslu2-linksys-kernel_2.4.22.bb
 
 DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
-MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
 PR = "r14"
 
 KERNEL_SUFFIX = "unslung"
diff --git a/packages/linux/xanadux-ba-2.6_2.6.12.bb b/packages/linux/xanadux-ba-2.6_2.6.12.bb
index 7935fe7196..96e29e5c4c 100644
--- a/packages/linux/xanadux-ba-2.6_2.6.12.bb
+++ b/packages/linux/xanadux-ba-2.6_2.6.12.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Xanadux Blueangel kernel based on the hh 2.6.12"
-MAINTAINER = "Ian Jordan <immolo@lycos.co.uk>"
 LICENSE = "GPL"
 PR="r0"
 
diff --git a/packages/linux/xanadux-un-2.6_2.6.12.bb b/packages/linux/xanadux-un-2.6_2.6.12.bb
index 1f5527400e..219a467b69 100644
--- a/packages/linux/xanadux-un-2.6_2.6.12.bb
+++ b/packages/linux/xanadux-un-2.6_2.6.12.bb
@@ -1,7 +1,6 @@
 ############## /home/jrs/cvs/oe/org.openembedded.dev/packages/linux/xanadux-un-2.6_2.6.12.bb ###############
 
 DESCRIPTION = "Xanadux HTC-Universal kernel based on the hh 2.6.12"
-MAINTAINER = "goxboxlive <goxboxlive@gmail.com>"
 LICENSE = "GPL"
 PR="r2"
 
diff --git a/packages/lirc/lirc-modules_0.8.0.bb b/packages/lirc/lirc-modules_0.8.0.bb
index d3a2b3d451..2689bcf26b 100644
--- a/packages/lirc/lirc-modules_0.8.0.bb
+++ b/packages/lirc/lirc-modules_0.8.0.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. This package contains the lirc kernel modules."
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>"
 HOMEPAGE = "http://www.lirc.org"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel fakeroot-native setserial"
diff --git a/packages/lirc/lirc_0.8.0.bb b/packages/lirc/lirc_0.8.0.bb
index 214ae5c60a..57be891c89 100644
--- a/packages/lirc/lirc_0.8.0.bb
+++ b/packages/lirc/lirc_0.8.0.bb
@@ -7,7 +7,6 @@ DESCRIPTION_append_lirc-nslu2example = " This package contains a working config
 SECTION = "console/network"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.lirc.org"
-MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel virtual/libx11 libxau libsm libice"
 DEPENDS_nslu2 = "virtual/kernel lirc-modules"
diff --git a/packages/litestream/litestream_1.3RC3.bb b/packages/litestream/litestream_1.3RC3.bb
index 4de9bc8327..506bff662b 100644
--- a/packages/litestream/litestream_1.3RC3.bb
+++ b/packages/litestream/litestream_1.3RC3.bb
@@ -1,5 +1,4 @@
 LICENSE = "GPL"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 DESCRIPTION = "ShoutCast-compatible streamer"
 PR = "r0"
 
diff --git a/packages/live555/live555_20051005.bb b/packages/live555/live555_20051005.bb
index 2eaf54e448..bc25517ea9 100644
--- a/packages/live555/live555_20051005.bb
+++ b/packages/live555/live555_20051005.bb
@@ -6,7 +6,6 @@ DESCRIPTION = "LIVE555 Streaming Media libraries"
 HOMEPAGE = "http://live.com/"
 LICENSE = "LGPL"
 SECTION = "devel"
-MAINTAINER = "Eddy Pronk <epronk@muftor.com>"
 
 SRC_URI = "http://live.com/liveMedia/public/live.2005.10.05.tar.gz \
            file://config.linux-cross"
diff --git a/packages/lm_sensors/lmsensors-apps_2.10.0.bb b/packages/lm_sensors/lmsensors-apps_2.10.0.bb
index 23695700c1..d69c64849d 100644
--- a/packages/lm_sensors/lmsensors-apps_2.10.0.bb
+++ b/packages/lm_sensors/lmsensors-apps_2.10.0.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION = "Hardware health monitoring applications"
 HOMEPAGE = "http://secure.netroedge.com/~lm78/"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 DEPENDS = "libsysfs"
 LICENSE = "GPL"
 
diff --git a/packages/lm_sensors/lmsensors-apps_2.9.2.bb b/packages/lm_sensors/lmsensors-apps_2.9.2.bb
index 24822cdefa..392521fc51 100644
--- a/packages/lm_sensors/lmsensors-apps_2.9.2.bb
+++ b/packages/lm_sensors/lmsensors-apps_2.9.2.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION = "Hardware health monitoring applications"
 HOMEPAGE = "http://secure.netroedge.com/~lm78/"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
 
 SRC_URI = "http://secure.netroedge.com/~lm78/archive/lm_sensors-${PV}.tar.gz"
diff --git a/packages/lmbench/lmbench_2.0.4.bb b/packages/lmbench/lmbench_2.0.4.bb
index e7bdb46c3a..04b78eca19 100644
--- a/packages/lmbench/lmbench_2.0.4.bb
+++ b/packages/lmbench/lmbench_2.0.4.bb
@@ -1,7 +1,6 @@
 SECTION = "console/utils"
 DESCRIPTION = "Tools for performance analysis."
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
 	   file://debian.patch;patch=1 \
diff --git a/packages/lockstat/lockstat_1.4.10.bb b/packages/lockstat/lockstat_1.4.10.bb
index 65fd73fe0a..7c6c84dd01 100644
--- a/packages/lockstat/lockstat_1.4.10.bb
+++ b/packages/lockstat/lockstat_1.4.10.bb
@@ -1,6 +1,5 @@
 SECTION = "console/utils"
 DESCRIPTION = "A tool for retrieving kernel spinlock metering information."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "virtual/kernel"
 
 SRC_URI = "ftp://oss.sgi.com/projects/lockmeter/download/lockstat-${PV}.tar.gz"
diff --git a/packages/login-manager/login-manager.bb b/packages/login-manager/login-manager.bb
index 44d8814713..9f5d8cd2b0 100644
--- a/packages/login-manager/login-manager.bb
+++ b/packages/login-manager/login-manager.bb
@@ -4,7 +4,6 @@ inherit update-rc.d
 DESCRIPTION = "Initscript for login-managers"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 PR = "r1"
 
 INITSCRIPT_NAME = "login-manager"
diff --git a/packages/logrotate-script/logrotate-script_cvs.bb b/packages/logrotate-script/logrotate-script_cvs.bb
index e22a68a97a..a46b265e2f 100644
--- a/packages/logrotate-script/logrotate-script_cvs.bb
+++ b/packages/logrotate-script/logrotate-script_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "simple logrotate bash script"
 RDEPENDS = "busybox"
 SECTION = "admin"
 PRIORITY = "optional"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 
 SRC_URI = "http://meshcube.org/download/logrotate_${SRCDATE}.tgz"
diff --git a/packages/loudmouth/loudmouth_1.0.1.bb b/packages/loudmouth/loudmouth_1.0.1.bb
index ab5ee81b9f..a8ad38fe4b 100644
--- a/packages/loudmouth/loudmouth_1.0.1.bb
+++ b/packages/loudmouth/loudmouth_1.0.1.bb
@@ -1,6 +1,5 @@
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 gnutls"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol."
 
 SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.gz"
diff --git a/packages/lttng/lttng-control_0.12.bb b/packages/lttng/lttng-control_0.12.bb
index 1596995fb0..937aa4f309 100644
--- a/packages/lttng/lttng-control_0.12.bb
+++ b/packages/lttng/lttng-control_0.12.bb
@@ -3,7 +3,6 @@ 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 <richard@openedhand.com>"
 
 SRC_URI = "http://ltt.polymtl.ca/lttng/ltt-control-${PV}-21062006.tar.gz"
 
diff --git a/packages/lttng/lttng-viewer_0.8.41-20060512.bb b/packages/lttng/lttng-viewer_0.8.41-20060512.bb
index c6069bc794..3251c2fcd3 100644
--- a/packages/lttng/lttng-viewer_0.8.41-20060512.bb
+++ b/packages/lttng/lttng-viewer_0.8.41-20060512.bb
@@ -3,7 +3,6 @@ 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 = "Richrd Purdie <richard@openedhand.com>"
 PR = "r1"
 DEPENDS = "gtk+ pango popt"
 
diff --git a/packages/lua/lua-gtk2_0.3.bb b/packages/lua/lua-gtk2_0.3.bb
index 4071bb1f04..35e564ae96 100644
--- a/packages/lua/lua-gtk2_0.3.bb
+++ b/packages/lua/lua-gtk2_0.3.bb
@@ -3,7 +3,6 @@ LICENSE = "GPL2"
 PRIORITY = "optional"
 DEPENDS = "gtk+ lua-native perl-native readline libffi"
 RDEPENDS = "lua"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 SECTION = "libs"
 
 inherit gpe
diff --git a/packages/lua/lua.inc b/packages/lua/lua.inc
index e93fef44b2..a03bf8ff22 100644
--- a/packages/lua/lua.inc
+++ b/packages/lua/lua.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "Lua is a powerful light-weight programming language designed \
 for extending applications."
 LICENSE = "MIT"
 HOMEPAGE = "http://www.lua.org/"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 PACKAGES = "${PN} liblua ${PN}-doc liblua-dev \
 	    liblualib liblualib-dev"
diff --git a/packages/lvm2/lvm2_2.01.09.bb b/packages/lvm2/lvm2_2.01.09.bb
index 66343596c4..bc8386f2ce 100644
--- a/packages/lvm2/lvm2_2.01.09.bb
+++ b/packages/lvm2/lvm2_2.01.09.bb
@@ -1,6 +1,5 @@
 SECTION = "utils"
 DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux."
-MAINTAINER = "Dan Williams <dan.j.williams@gmail.com>"
 LICENSE = "GPL"
 PR = "r1"
 DEPENDS = "device-mapper"
diff --git a/packages/lvm2/lvm2_2.01.15.bb b/packages/lvm2/lvm2_2.01.15.bb
index 80a4a0c84b..f4e84fb064 100644
--- a/packages/lvm2/lvm2_2.01.15.bb
+++ b/packages/lvm2/lvm2_2.01.15.bb
@@ -1,6 +1,5 @@
 SECTION = "utils"
 DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux."
-MAINTAINER = "Dan Williams <dan.j.williams@gmail.com>"
 LICENSE = "GPL"
 PR = ""
 DEPENDS = "device-mapper"
diff --git a/packages/lxt/lxt_1.0.bb b/packages/lxt/lxt_1.0.bb
index 563b407f93..4cefc60f26 100644
--- a/packages/lxt/lxt_1.0.bb
+++ b/packages/lxt/lxt_1.0.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 SECTION = "console/utils"
 DESCRIPTION = "lxt ncurses filemanager xtree clone"
 PRIORITY = "optional"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
 DEPENDS = "ncurses"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/lxt-1.0"
 
diff --git a/packages/lyx/lyx_1.4.1.bb b/packages/lyx/lyx_1.4.1.bb
index 0ff8489134..f0c139da64 100644
--- a/packages/lyx/lyx_1.4.1.bb
+++ b/packages/lyx/lyx_1.4.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "LyX is an advanced type setting processor - a frontend for LaTeX"
 SECTION = "x11/office"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.lyx.org"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "boost"
 RRECOMMENDS = "tetex"
 PR = "r1"
diff --git a/packages/m4/m4_1.4.2.bb b/packages/m4/m4_1.4.2.bb
index 9228ef4334..05a9b5b0a5 100644
--- a/packages/m4/m4_1.4.2.bb
+++ b/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/packages/macchanger/macchanger_1.5.0.bb b/packages/macchanger/macchanger_1.5.0.bb
index 6f85a90098..e631299341 100644
--- a/packages/macchanger/macchanger_1.5.0.bb
+++ b/packages/macchanger/macchanger_1.5.0.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "A GNU/Linux utility for viewing/manipulating the MAC address of network interfaces"
 HOMEPAGE = "http://www.alobbs.com/modules.php?op=modload&name=macc&file=index"
-MAINTAINER = "Nigel Kostiuck <emte@labotomy.net>"
 LICENSE = "GPL"
 SECTION = "net"
 PRIORITY = "optional"
diff --git a/packages/madplay/madplay_0.15.2b.bb b/packages/madplay/madplay_0.15.2b.bb
index ba2d184a22..d942b965e2 100644
--- a/packages/madplay/madplay_0.15.2b.bb
+++ b/packages/madplay/madplay_0.15.2b.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Madplay is a command-line MPEG audio decoder and player"
-MAINTAINER = "Maciej Swiniarski <luzik@gda.pl>"
 SECTION = "console/multimedia"
 DEPENDS = "libmad"
 LICENSE = "GPL"
diff --git a/packages/madwifi/madwifi-modules_cvs-bsd.bb b/packages/madwifi/madwifi-modules_cvs-bsd.bb
index be6de0663f..151c80d2f4 100644
--- a/packages/madwifi/madwifi-modules_cvs-bsd.bb
+++ b/packages/madwifi/madwifi-modules_cvs-bsd.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
 DEPENDS = "virtual/kernel"
diff --git a/packages/madwifi/madwifi-modules_cvs.bb b/packages/madwifi/madwifi-modules_cvs.bb
index 826cfc58a0..a44b7c9132 100644
--- a/packages/madwifi/madwifi-modules_cvs.bb
+++ b/packages/madwifi/madwifi-modules_cvs.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
 DEPENDS = "virtual/kernel"
diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc
index 488d9aefa4..215d8c2885 100644
--- a/packages/madwifi/madwifi-ng_r.inc
+++ b/packages/madwifi/madwifi-ng_r.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 LICENSE = "GPL"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
 DEPENDS = "virtual/kernel"
diff --git a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
index 8e5975137e..6b7eddb03b 100644
--- a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
+++ b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
@@ -2,7 +2,6 @@ SECTION = "x11/utils"
 DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
 DESCRIPTION = "Settings daemon using DBUS for communication (osso version)."
 LICENSE = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 PROVIDES = "gconf"
 RPROVIDES = "gconf"
 
diff --git a/packages/maemo/hildon-base-lib_0.8.6-2.bb b/packages/maemo/hildon-base-lib_0.8.6-2.bb
index 19926f75f8..58d7f54a8b 100644
--- a/packages/maemo/hildon-base-lib_0.8.6-2.bb
+++ b/packages/maemo/hildon-base-lib_0.8.6-2.bb
@@ -1,6 +1,5 @@
 PR = "r0"
 LICENSE = 	"LGPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = "gtk+-2.6.4-1.osso7 outo"
 
diff --git a/packages/maemo/hildon-control-panel_0.9.1-1.2.bb b/packages/maemo/hildon-control-panel_0.9.1-1.2.bb
index fe6d69e8f9..a50a0b18f5 100644
--- a/packages/maemo/hildon-control-panel_0.9.1-1.2.bb
+++ b/packages/maemo/hildon-control-panel_0.9.1-1.2.bb
@@ -1,6 +1,5 @@
 PR         = "r2"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = "hildon-lgpl hildon-base-lib osso-af-settings libosso hildon-libs osso-af-settings libosso-help"
 
diff --git a/packages/maemo/hildon-fm_0.9.1-2.bb b/packages/maemo/hildon-fm_0.9.1-2.bb
index 5be7259d98..7a82863075 100644
--- a/packages/maemo/hildon-fm_0.9.1-2.bb
+++ b/packages/maemo/hildon-fm_0.9.1-2.bb
@@ -1,6 +1,5 @@
 PR 	= 	"r1"
 LICENSE =	"GPL/LGPL"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"gtk+-2.6.4-1.osso7 outo libxi libxt libpng gconf hildon-lgpl osso-thumbnail osso-gwconnect"
 SRC_URI = 	"http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-fm/hildon-fm_${PV}.tar.gz"
diff --git a/packages/maemo/hildon-home_0.8.20-2.bb b/packages/maemo/hildon-home_0.8.20-2.bb
index 0ac72a55d9..e4050c7406 100644
--- a/packages/maemo/hildon-home_0.8.20-2.bb
+++ b/packages/maemo/hildon-home_0.8.20-2.bb
@@ -1,6 +1,5 @@
 PR         = "r2"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = "gtk+-2.6.4-1.osso7 hildon-lgpl libosso hildon-base-lib hildon-libs osso-gnome-vfs2 osso-thumbnail"
 
diff --git a/packages/maemo/hildon-initscripts_0.8.14-1.bb b/packages/maemo/hildon-initscripts_0.8.14-1.bb
index 7eedf32d09..ef93f007cb 100644
--- a/packages/maemo/hildon-initscripts_0.8.14-1.bb
+++ b/packages/maemo/hildon-initscripts_0.8.14-1.bb
@@ -1,6 +1,5 @@
 PR         = "r2"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = "gtk+-2.6.4-1.osso7 matchbox-wm dbus osso-esd"
 
diff --git a/packages/maemo/hildon-lgpl_0.9.14-2.bb b/packages/maemo/hildon-lgpl_0.9.14-2.bb
index 7d09b02127..63d29b7ea1 100644
--- a/packages/maemo/hildon-lgpl_0.9.14-2.bb
+++ b/packages/maemo/hildon-lgpl_0.9.14-2.bb
@@ -1,5 +1,4 @@
 LICENSE = 	"LGPL"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = "gtk+-2.6.4-1.osso7 outo libxtst libmatchbox libxi libxt libpng gconf"
 
diff --git a/packages/maemo/hildon-libs_0.9.6-2.bb b/packages/maemo/hildon-libs_0.9.6-2.bb
index bcbdccb8e4..947f22ce66 100644
--- a/packages/maemo/hildon-libs_0.9.6-2.bb
+++ b/packages/maemo/hildon-libs_0.9.6-2.bb
@@ -1,6 +1,5 @@
 PR 	= 	"r1"
 LICENSE = 	"LGPL"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"dbus hildon-lgpl hildon-fm outo gtk+-2.6.4-1.osso7"
 SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
diff --git a/packages/maemo/hildon-navigator_0.9.6-2.bb b/packages/maemo/hildon-navigator_0.9.6-2.bb
index 26560a3a07..569733831b 100644
--- a/packages/maemo/hildon-navigator_0.9.6-2.bb
+++ b/packages/maemo/hildon-navigator_0.9.6-2.bb
@@ -1,6 +1,5 @@
 PR         = "r2"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de"
 
 DEPENDS = "gtk+-2.6.4-1.osso7 libmatchbox gconf hildon-lgpl libosso osso-af-settings hildon-base-lib"
 
diff --git a/packages/maemo/hildon-status-bar_0.8.11-1.bb b/packages/maemo/hildon-status-bar_0.8.11-1.bb
index f6f0eab873..ea8f21349d 100644
--- a/packages/maemo/hildon-status-bar_0.8.11-1.bb
+++ b/packages/maemo/hildon-status-bar_0.8.11-1.bb
@@ -1,6 +1,5 @@
 PR         = "r1"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = "hildon-lgpl libosso hildon-libs"
 
diff --git a/packages/maemo/lessertunjo_0.0.10.bb b/packages/maemo/lessertunjo_0.0.10.bb
index a0c81af27b..c15ff958ac 100644
--- a/packages/maemo/lessertunjo_0.0.10.bb
+++ b/packages/maemo/lessertunjo_0.0.10.bb
@@ -1,5 +1,4 @@
 LICENSE =	"LGPL"
-MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"gconf-osso hildon-libs dbus libosso"
 SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/l/lessertunjo/lessertunjo_${PV}-3.tar.gz"
diff --git a/packages/maemo/libosso-help_1.0.01.bb b/packages/maemo/libosso-help_1.0.01.bb
index 34c81c749c..9a4c1f471c 100644
--- a/packages/maemo/libosso-help_1.0.01.bb
+++ b/packages/maemo/libosso-help_1.0.01.bb
@@ -1,5 +1,4 @@
 LICENSE = 	"LGPL"
-MAINTAINER =	"Florian Boor <florian@kernelconcepts.de>"
 PR = "r0"
 
 DEPENDS = 	"libosso hildon-lgpl hildon-base-lib hildon-libs"
diff --git a/packages/maemo/libosso_0.8.9.bb b/packages/maemo/libosso_0.8.9.bb
index ead1b7ce37..90767d78d1 100644
--- a/packages/maemo/libosso_0.8.9.bb
+++ b/packages/maemo/libosso_0.8.9.bb
@@ -1,5 +1,4 @@
 LICENSE = 	"LGPL"
-MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 PR = "r2"
 
 DEPENDS = 	"glib-2.0 dbus outo"
diff --git a/packages/maemo/nokia770-init_1.0.bb b/packages/maemo/nokia770-init_1.0.bb
index 14ec4a0cfd..96b8aa27be 100644
--- a/packages/maemo/nokia770-init_1.0.bb
+++ b/packages/maemo/nokia770-init_1.0.bb
@@ -1,5 +1,4 @@
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de"
 PR         = "r3"
 
 DEPENDS    = "base-passwd"
diff --git a/packages/maemo/osso-af-settings_0.8.5.bb b/packages/maemo/osso-af-settings_0.8.5.bb
index 5d14b98645..e7da65b6ed 100644
--- a/packages/maemo/osso-af-settings_0.8.5.bb
+++ b/packages/maemo/osso-af-settings_0.8.5.bb
@@ -1,5 +1,4 @@
 LICENSE    =	"LGPL"
-MAINTAINER =	"Florian Boor <florian@kernelconcepts.de"
 
 DEPENDS =	""
 SRC_URI =	"http://stage.maemo.org:80/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}-1.tar.gz"
diff --git a/packages/maemo/osso-af-startup_0.28-1.bb b/packages/maemo/osso-af-startup_0.28-1.bb
index 6d476ab380..640ebc9671 100644
--- a/packages/maemo/osso-af-startup_0.28-1.bb
+++ b/packages/maemo/osso-af-startup_0.28-1.bb
@@ -1,5 +1,4 @@
 LICENSE =	"unknown"
-MAINTAINER=	"Florian Boor <florian@kernelconcepts.de"
 PR 	= "r4"
 
 PACKAGES=	"${PN} osso-af-services osso-af-base-apps"
diff --git a/packages/maemo/osso-af-utils_0.4.bb b/packages/maemo/osso-af-utils_0.4.bb
index 7ca7378c9c..f8fc7b2729 100644
--- a/packages/maemo/osso-af-utils_0.4.bb
+++ b/packages/maemo/osso-af-utils_0.4.bb
@@ -1,5 +1,4 @@
 LICENSE =	"LGPL"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"virtual/libx11 dbus libosso"
 SRC_URI =	"http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-utils/osso-af-utils_${PV}-1.tar.gz"
diff --git a/packages/maemo/osso-app-killer_0.4-3.bb b/packages/maemo/osso-app-killer_0.4-3.bb
index 7ecc7723bf..e531120956 100644
--- a/packages/maemo/osso-app-killer_0.4-3.bb
+++ b/packages/maemo/osso-app-killer_0.4-3.bb
@@ -1,6 +1,5 @@
 PR         = "r0"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = "libosso"
 
diff --git a/packages/maemo/osso-application-installer_1.0.03-1.bb b/packages/maemo/osso-application-installer_1.0.03-1.bb
index 947368c46c..7380255c81 100644
--- a/packages/maemo/osso-application-installer_1.0.03-1.bb
+++ b/packages/maemo/osso-application-installer_1.0.03-1.bb
@@ -1,6 +1,5 @@
 PR         = "r0"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = "hildon-lgpl hildon-base-lib libosso hildon-libs hildon-control-panel shared-mime-info"
 RDEPENDS = "shared-mime-info"
diff --git a/packages/maemo/osso-bttools_0.25.1.bb b/packages/maemo/osso-bttools_0.25.1.bb
index 9e602af548..9bb31ea205 100644
--- a/packages/maemo/osso-bttools_0.25.1.bb
+++ b/packages/maemo/osso-bttools_0.25.1.bb
@@ -1,5 +1,4 @@
 LICENSE =	"LGPL"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"dbus glib-2.0 libosso bluez-libs"
 
diff --git a/packages/maemo/osso-core-config_200515.1.bb b/packages/maemo/osso-core-config_200515.1.bb
index 42281314ac..999a23e41e 100644
--- a/packages/maemo/osso-core-config_200515.1.bb
+++ b/packages/maemo/osso-core-config_200515.1.bb
@@ -1,5 +1,4 @@
 LICENSE    = "unknown"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de"
 PR         = "r6"
 
 DEPENDS =	"base-passwd osso-af-startup"
diff --git a/packages/maemo/osso-dsp-headers_0.1.bb b/packages/maemo/osso-dsp-headers_0.1.bb
index 41e4fe87ea..1cce84b9cc 100644
--- a/packages/maemo/osso-dsp-headers_0.1.bb
+++ b/packages/maemo/osso-dsp-headers_0.1.bb
@@ -1,6 +1,5 @@
 PR         = "r0"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = ""
 
diff --git a/packages/maemo/osso-esd_0.5.bb b/packages/maemo/osso-esd_0.5.bb
index ac8f7284ef..e53cc95a05 100644
--- a/packages/maemo/osso-esd_0.5.bb
+++ b/packages/maemo/osso-esd_0.5.bb
@@ -1,6 +1,5 @@
 PR         = "r0"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 PROVIDES   = "esd"
 RPROVIDES_${PN}  = "esd"
 
diff --git a/packages/maemo/osso-gwconnect_0.70.1.bb b/packages/maemo/osso-gwconnect_0.70.1.bb
index bcf5caff7a..7759e99e9c 100644
--- a/packages/maemo/osso-gwconnect_0.70.1.bb
+++ b/packages/maemo/osso-gwconnect_0.70.1.bb
@@ -1,5 +1,4 @@
 LICENSE = 	""
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"dbus gconf glib-2.0 libosso bluez-libs"
 
diff --git a/packages/maemo/osso-gwobex_0.26.1.bb b/packages/maemo/osso-gwobex_0.26.1.bb
index e6204cd212..374f589457 100644
--- a/packages/maemo/osso-gwobex_0.26.1.bb
+++ b/packages/maemo/osso-gwobex_0.26.1.bb
@@ -1,5 +1,4 @@
 LICENSE =	"LGPL"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = 	"glib-2.0 openobex dbus libxml2 osso-gwconnect"
 
diff --git a/packages/maemo/osso-screenshot-tool_1.20-1.bb b/packages/maemo/osso-screenshot-tool_1.20-1.bb
index 3b039be934..5568191fdf 100644
--- a/packages/maemo/osso-screenshot-tool_1.20-1.bb
+++ b/packages/maemo/osso-screenshot-tool_1.20-1.bb
@@ -1,6 +1,5 @@
 PR         = "r0"
 LICENSE    = ""
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = "gtk+-2.6.4-1.osso7"
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz"
diff --git a/packages/maemo/osso-sounds_0.3-1.bb b/packages/maemo/osso-sounds_0.3-1.bb
index 588c3139fd..8d82a29610 100644
--- a/packages/maemo/osso-sounds_0.3-1.bb
+++ b/packages/maemo/osso-sounds_0.3-1.bb
@@ -1,6 +1,5 @@
 PR         = "r0"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = "audiofile"
 
diff --git a/packages/maemo/osso-thumbnail_0.3.1-1.bb b/packages/maemo/osso-thumbnail_0.3.1-1.bb
index 551d4d4128..866e755b0d 100644
--- a/packages/maemo/osso-thumbnail_0.3.1-1.bb
+++ b/packages/maemo/osso-thumbnail_0.3.1-1.bb
@@ -1,6 +1,5 @@
 PR 	= "r2"
 LICENSE =	""
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = "gtk+-2.6.4-1.osso7 osso-gnome-vfs2"
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/osso-thumbnail/osso-thumbnail_${PV}.tar.gz"
diff --git a/packages/maemo/outo_0.1.1.bb b/packages/maemo/outo_0.1.1.bb
index 368b0bb243..79789f5105 100644
--- a/packages/maemo/outo_0.1.1.bb
+++ b/packages/maemo/outo_0.1.1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Outo Unit Tester by Otso"
 LICENSE	=	"LGPL"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/o/outo/outo_${PV}.orig.tar.gz \
 			http://repository.maemo.org/pool/maemo/ossw/source/o/outo/outo_0.1.1-2.diff.gz;patch=1;pnum=1"
diff --git a/packages/maemo/sapwood_1.20-1.bb b/packages/maemo/sapwood_1.20-1.bb
index 207c5fee73..e4241e324e 100644
--- a/packages/maemo/sapwood_1.20-1.bb
+++ b/packages/maemo/sapwood_1.20-1.bb
@@ -2,7 +2,6 @@ PR = "r1"
 LICENSE = "GPL"
 SECTION = "x11/base"
 DESCRIPTION = "GTK theme engine Sapwood"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 DEPENDS = "gtk+-2.6.4-1.osso7"
 
 FILES_${PN} += "${libdir}/gtk-2.0/2.4.0/engines/"
diff --git a/packages/maemo/sdk-default-icons_0.2-1.bb b/packages/maemo/sdk-default-icons_0.2-1.bb
index 769c71b77c..d23cc6935f 100644
--- a/packages/maemo/sdk-default-icons_0.2-1.bb
+++ b/packages/maemo/sdk-default-icons_0.2-1.bb
@@ -1,6 +1,5 @@
 PR         = "r0"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = ""
 
diff --git a/packages/maemo/sdk-default-theme-config_1.0-1.bb b/packages/maemo/sdk-default-theme-config_1.0-1.bb
index c5b0e240a8..9b9d0f3a58 100644
--- a/packages/maemo/sdk-default-theme-config_1.0-1.bb
+++ b/packages/maemo/sdk-default-theme-config_1.0-1.bb
@@ -1,6 +1,5 @@
 PR         = "r0"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = "sdk-default-theme"
 RDEPENDS = "sdk-default-theme"
diff --git a/packages/maemo/sdk-default-theme_0.1-1.bb b/packages/maemo/sdk-default-theme_0.1-1.bb
index 11847958d4..7e1808da76 100644
--- a/packages/maemo/sdk-default-theme_0.1-1.bb
+++ b/packages/maemo/sdk-default-theme_0.1-1.bb
@@ -1,6 +1,5 @@
 PR         = "r0"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 DEPENDS = ""
 
diff --git a/packages/maemo/tscalib_0.0.1-3.bb b/packages/maemo/tscalib_0.0.1-3.bb
index 6c1a72b185..a02b9fd4f4 100644
--- a/packages/maemo/tscalib_0.0.1-3.bb
+++ b/packages/maemo/tscalib_0.0.1-3.bb
@@ -1,6 +1,5 @@
 PR         = "r0"
 LICENSE    = "GPL"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 DEPENDS    = "virtual/xserver tslib"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/${PN}/${PN}_${PV}.tar.gz \
diff --git a/packages/man/man_1.5p.bb b/packages/man/man_1.5p.bb
index c2e0e829ce..34b2bff32a 100644
--- a/packages/man/man_1.5p.bb
+++ b/packages/man/man_1.5p.bb
@@ -1,6 +1,5 @@
 LICENSE = "GPL"
 SECTION = "base"
-MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>"
 DESCRIPTION = "The man page suite, including man, apropos, \
 and whatis consists of programs that are used to read most \
 of the documentation available on a Linux system."
diff --git a/packages/manufacturers/manufacturers_20031209.bb b/packages/manufacturers/manufacturers_20031209.bb
index 43237dbcad..176da52dda 100644
--- a/packages/manufacturers/manufacturers_20031209.bb
+++ b/packages/manufacturers/manufacturers_20031209.bb
@@ -1,7 +1,6 @@
 SECTION = "base"
 DESCRIPTION = "Ethernet manufacturer database"
 LICENSE = "PD"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
 SRCDATE = "${PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/etc"
diff --git a/packages/maradns/maradns_1.0.23.bb b/packages/maradns/maradns_1.0.23.bb
index f70746c56e..d7f02d5565 100644
--- a/packages/maradns/maradns_1.0.23.bb
+++ b/packages/maradns/maradns_1.0.23.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION = "A security-aware DNS server"
 HOMEPAGE = "http://www.maradns.org"
 LICENSE = "PD"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 PR = "r1"
 
 SRC_URI = "http://www.maradns.org/download/maradns-${PV}.tar.bz2 \
diff --git a/packages/masqmail/masqmail_0.2.20.bb b/packages/masqmail/masqmail_0.2.20.bb
index c5f29a7f2e..1a64833bfc 100644
--- a/packages/masqmail/masqmail_0.2.20.bb
+++ b/packages/masqmail/masqmail_0.2.20.bb
@@ -1,7 +1,6 @@
 # MasqMail from http://innominate.org/kurth/masqmail/
 DESCRIPTION = "MasqMail is a mail server designed for hosts that do not have a permanent internet connection eg. a home network or a single host at home. It has special support for connections to different ISPs. It replaces sendmail or other MTAs such as qmail or exim."
 HOMEPAGE = "http://innominate.org/kurth/masqmail/"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb
index f483d6ec43..6ee3bd2c77 100644
--- a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb
+++ b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Tasks applet switcher for matchbox"
 LICENSE = "GPLv2"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "gtk+ libwnck libmatchbox"
 
 PR = "r1"
diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 7042bf22d5..df0489569a 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Matchbox virtual keyboard for X11"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft"
 SECTION = "x11"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = "0.0+svn${SRCDATE}"
 PR="r2"
 
diff --git a/packages/mathomatic/mathomatic.inc b/packages/mathomatic/mathomatic.inc
index a39af7fe2c..64fe0fe60d 100644
--- a/packages/mathomatic/mathomatic.inc
+++ b/packages/mathomatic/mathomatic.inc
@@ -3,7 +3,6 @@ HOMEPAGE = "http://mathomatic.orgserve.de/math/"
 SECTION = "console/utils"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "S.G.Pickering@bath.ac.uk"
 DEPENDS = "readline"
 
 inherit autotools
diff --git a/packages/mbmerlin/mbmerlin_0.8.1-2.bb b/packages/mbmerlin/mbmerlin_0.8.1-2.bb
index 26d10abbef..4842aac7ff 100644
--- a/packages/mbmerlin/mbmerlin_0.8.1-2.bb
+++ b/packages/mbmerlin/mbmerlin_0.8.1-2.bb
@@ -7,7 +7,6 @@ DEPENDS = "virtual/xserver libxft startup-notification"
 
 SECTION = "x11"
 PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/mbmerlin ${datadir}/applications"
 FILES_${PN} += " ${datadir}/pixmaps"
 
diff --git a/packages/mdadm/mdadm.inc b/packages/mdadm/mdadm.inc
index 5b293b7a68..cebec627af 100644
--- a/packages/mdadm/mdadm.inc
+++ b/packages/mdadm/mdadm.inc
@@ -2,7 +2,6 @@ SECTION = "utils"
 DESCRIPTION = "mdadm is a tool for creating, managing and monitoring \
 device arrays using the "md" driver in Linux, also \
 known as Software RAID arrays."
-MAINTAINER = "Dan Williams <dan.j.williams@gmail.com>"
 LICENSE = "GPL"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/${PN}-${PV}.tar.bz2"
diff --git a/packages/memtester/memtester_4.0.5.bb b/packages/memtester/memtester_4.0.5.bb
index 3a45690a95..ec0fbf2216 100644
--- a/packages/memtester/memtester_4.0.5.bb
+++ b/packages/memtester/memtester_4.0.5.bb
@@ -1,6 +1,5 @@
 SECTION = "console/utils"
 DESCRIPTION = "Utility to test for faulty memory subsystem"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPLv2"
 PR = "r1"
 
diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb
index cd9b132b7c..7716fa674d 100644
--- a/packages/meta/meta-gpe-extras.bb
+++ b/packages/meta/meta-gpe-extras.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = MIT
 PR="r2"
 
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index d12621ad65..2360db447f 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "MIT"
 PR = "r42"
 
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index d8c4673090..e25e9b8261 100644
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -1,6 +1,5 @@
 PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme
 DESCRIPTION = "Meta-package for maemo environment"
-MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 PR          = "r8"
 
 ALLOW_EMPTY = "1"
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index b0f32412d8..70bcfc4bc5 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Meta-package for GPE Security Testing Image"
-MAINTAINER = "Bob Davies tyggerbob@rogers.com>"
 LICENSE = "MIT"
 PR = "r6"
 
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 3bf49d3552..9ec3e85e8f 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -3,7 +3,6 @@
 # All packages in here must build with the slugos-???.conf distros,
 # they do not necessarily work.
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
 PR = "r15"
diff --git a/packages/meta/xbase-clients.bb b/packages/meta/xbase-clients.bb
index 5e0e590daf..52afebac38 100644
--- a/packages/meta/xbase-clients.bb
+++ b/packages/meta/xbase-clients.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Basic X clients (meta package)"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 PR = "r1"
 
 ALLOW_EMPTY = 1
diff --git a/packages/miau/miau_0.5.3.bb b/packages/miau/miau_0.5.3.bb
index 4f2b52dfa1..38faec8448 100644
--- a/packages/miau/miau_0.5.3.bb
+++ b/packages/miau/miau_0.5.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "MIAU IRC Bouncer"
 SECTION = "network"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 HOMEPAGE = "http://sf.net/project/miau/"
 LICENSE = "GPL"
 PR = "r2"
diff --git a/packages/micro-emacs/micro-emacs_20040301.bb b/packages/micro-emacs/micro-emacs_20040301.bb
index 4c0ac781e2..e8c494794b 100644
--- a/packages/micro-emacs/micro-emacs_20040301.bb
+++ b/packages/micro-emacs/micro-emacs_20040301.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Mini-version of emacs, from http://www.jasspa.com"
 SECTION = "console/utils"
 PRIORITY = "optional"
-MAINTAINER = "Jason Haslup <openembedded@haslup.com>"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
 
diff --git a/packages/microcom/microcom_1.02.bb b/packages/microcom/microcom_1.02.bb
index e0c0512478..a268eadc23 100644
--- a/packages/microcom/microcom_1.02.bb
+++ b/packages/microcom/microcom_1.02.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "microcom is a small minicom-like serial terminal emulator with \
 scripting support."
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 # http://microcom.port5.com/m102.tar.gz is no longer available
 #NOTE: this should probably be converted to pull from sourceforge
diff --git a/packages/microwindows/microwindows_0.90.bb b/packages/microwindows/microwindows_0.90.bb
index cb84e95781..495ab753d8 100644
--- a/packages/microwindows/microwindows_0.90.bb
+++ b/packages/microwindows/microwindows_0.90.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Microwindows Graphical Engine"
 SECTION = "x11/wm"
 PRIORITY = "optional"
-MAINTAINER = "Jordan Crouse <jordan@cosmicpenguin.net>"
 DEPENDS = "libpng jpeg"
 LICENSE = "GPL"
 SRC_URI = "ftp://ftp.microwindows.org/pub/microwindows/microwindows-${PV}.tar.gz"
diff --git a/packages/mikmod/mikmod_3.2.2-beta1.bb b/packages/mikmod/mikmod_3.2.2-beta1.bb
index 76acab9f64..e021f6776f 100644
--- a/packages/mikmod/mikmod_3.2.2-beta1.bb
+++ b/packages/mikmod/mikmod_3.2.2-beta1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A module player based on libmikmod."
 SECTION = "console/multimedia"
 HOMEPAGE = "http://mikmod.raphnet.net"
-MAINTAINER = "Michael 'Mickey' Lauer"
 DEPENDS = "ncurses libmikmod"
 PR = "r1"
 LICENSE = "GPL"
diff --git a/packages/militaryalphabet/militaryalphabet_0.2.1.bb b/packages/militaryalphabet/militaryalphabet_0.2.1.bb
index c24230a4e6..3caec910c0 100644
--- a/packages/militaryalphabet/militaryalphabet_0.2.1.bb
+++ b/packages/militaryalphabet/militaryalphabet_0.2.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Militaryalphabet"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 LICENSE = "GPL"
 APPNAME = "militaryalphabet"
 APPTYPE = "binary"
diff --git a/packages/mime-support/mime-support_3.28.bb b/packages/mime-support/mime-support_3.28.bb
index ee8f93fef8..7febf2c1e0 100644
--- a/packages/mime-support/mime-support_3.28.bb
+++ b/packages/mime-support/mime-support_3.28.bb
@@ -1,6 +1,5 @@
 SECTION = "base"
 DESCRIPTION = "MIME files 'mime.types' & 'mailcap', and support programs"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 
 DEPENDS = "file"
 RRECOMMENDS = "file"
diff --git a/packages/miniclipboard/miniclipboard_0.3.bb b/packages/miniclipboard/miniclipboard_0.3.bb
index 980f928ccd..ba35902db7 100644
--- a/packages/miniclipboard/miniclipboard_0.3.bb
+++ b/packages/miniclipboard/miniclipboard_0.3.bb
@@ -4,7 +4,6 @@ LICENSE = "LGPL"
 DESCRIPTION = "Clipboard management application"
 DEPENDS = "virtual/libx11"
 RDEPENDS = "gdk-pixbuf-loader-xpm"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r1"
 
 SRC_URI += "file://miniclipboard.desktop"
diff --git a/packages/minifo/minifo-modules_0.6.1-pre1.bb b/packages/minifo/minifo-modules_0.6.1-pre1.bb
index e31e5578ae..ae6e5ebb4c 100644
--- a/packages/minifo/minifo-modules_0.6.1-pre1.bb
+++ b/packages/minifo/minifo-modules_0.6.1-pre1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "The mini fanout overlay file system"
 HOMEPAGE = "http://www.denx.de/twiki/bin/view/Know/MiniFOHome"
 LICENSE = "GPL"
 SECTION = "kernel/modules"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 
 SRC_URI = "http://www.denx.de/twiki/pub/Know/MiniFOHome/mini_fo-0-6-1-pre1.tar.bz2"
diff --git a/packages/miniinit/miniinit.bb b/packages/miniinit/miniinit.bb
index 6c76be5281..ede7432c19 100644
--- a/packages/miniinit/miniinit.bb
+++ b/packages/miniinit/miniinit.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "minimal init."
 SECTION = "base"
 LICENSE = "GPL"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 
 # SERIAL_CONSOLE is generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
diff --git a/packages/minimix/minimix_0.7.bb b/packages/minimix/minimix_0.7.bb
index 484393c322..feb45c50ad 100644
--- a/packages/minimix/minimix_0.7.bb
+++ b/packages/minimix/minimix_0.7.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Volume Control Applet for GPE"
 LICENSE = "GPL"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 
 DEPENDS = "libgpewidget"
diff --git a/packages/minimix/minimix_0.8.bb b/packages/minimix/minimix_0.8.bb
index 484393c322..feb45c50ad 100644
--- a/packages/minimix/minimix_0.8.bb
+++ b/packages/minimix/minimix_0.8.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Volume Control Applet for GPE"
 LICENSE = "GPL"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 
 DEPENDS = "libgpewidget"
diff --git a/packages/minisip/minisip-video_svn.bb b/packages/minisip/minisip-video_svn.bb
index 7c0216bff3..87ad66e43f 100644
--- a/packages/minisip/minisip-video_svn.bb
+++ b/packages/minisip/minisip-video_svn.bb
@@ -2,7 +2,6 @@ PV = "0.6.2+svn${SRCDATE}"
 LICENSE = "GPL"
 SECTION = "x11/utils"
 PR = "r0"
-MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>"
 CONFLICTS = "minisip"
 
 DESCRIPTION = "SIP user agent, with focus on security - video support"
diff --git a/packages/minisip/minisip_0.6.2.bb b/packages/minisip/minisip_0.6.2.bb
index 3876c04029..b85007deef 100644
--- a/packages/minisip/minisip_0.6.2.bb
+++ b/packages/minisip/minisip_0.6.2.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/utils"
 PR = "r0"
-MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>"
 
 DESCRIPTION = "SIP user agent, with focus on security"
 DEPENDS = "libglademm libmsip0 libmikey0"
diff --git a/packages/minisip/minisip_svn.bb b/packages/minisip/minisip_svn.bb
index 73541cc1da..51573940ad 100644
--- a/packages/minisip/minisip_svn.bb
+++ b/packages/minisip/minisip_svn.bb
@@ -2,7 +2,6 @@ PV = "0.6.2+svn${SRCDATE}"
 LICENSE = "GPL"
 SECTION = "x11/utils"
 PR = "r0"
-MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>"
 
 DESCRIPTION = "SIP user agent, with focus on security"
 DEPENDS = "libglademm libmsip0 libmikey0"
diff --git a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
index 8a4fd421e7..c26a714ee7 100644
--- a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
+++ b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "one-time install package to upgrade the firmware of all installed
 RDEPENDS = "hostap-modules-pci hostap-utils"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "unknown"
 
 SRC_URI = "http://www.red-bean.com/~proski/firmware/${PV}.tar.bz2"
diff --git a/packages/mkbot/mkbot_0.3.bb b/packages/mkbot/mkbot_0.3.bb
index dd75418fdb..195d74ca52 100644
--- a/packages/mkbot/mkbot_0.3.bb
+++ b/packages/mkbot/mkbot_0.3.bb
@@ -4,7 +4,6 @@ HOMEPAGE = "http://fredemmott.co.uk/index.php?page=mkbot"
 AUTHOR = "Fred Emmott"
 LICENSE = "GPL"
 SECTION = "network"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "http://files.fredemmott.co.uk/mkbot-${PV}.tar.bz2"
 S = "${WORKDIR}/MKbot-0.3"
diff --git a/packages/mml-widget/gtkmathview_0.7.6.bb b/packages/mml-widget/gtkmathview_0.7.6.bb
index fbb6b5faf9..7cb91b4ba3 100644
--- a/packages/mml-widget/gtkmathview_0.7.6.bb
+++ b/packages/mml-widget/gtkmathview_0.7.6.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/"
 DEPENDS = "gtk+ popt libxslt libxml2"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
 
diff --git a/packages/mobilemesh/mobilemesh_1.2.bb b/packages/mobilemesh/mobilemesh_1.2.bb
index 531089dd5f..df8f2f98bb 100644
--- a/packages/mobilemesh/mobilemesh_1.2.bb
+++ b/packages/mobilemesh/mobilemesh_1.2.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "MobileMesh mobile ad-hoc routing protocol"
 HOMEPAGE = "http://www.mitre.org/work/tech_transfer/mobilemesh/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 DEPENDS = "openssl"
 SRC_URI = "http://meshcube.org/download/mobilemesh_1.2.tgz"
diff --git a/packages/moc/moc_2.4.0.bb b/packages/moc/moc_2.4.0.bb
index cb9cf6d7db..4c77655fc7 100644
--- a/packages/moc/moc_2.4.0.bb
+++ b/packages/moc/moc_2.4.0.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "MOC is a ncurses based music player"
-MAINTAINER = "Kristoffer Ericson <kristoffer@jlime.com>"
 SECTION = "console/multimedia"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
diff --git a/packages/modplugplay/modplugplay_1.0.bb b/packages/modplugplay/modplugplay_1.0.bb
index 47c7aa4e06..45caf8d083 100644
--- a/packages/modplugplay/modplugplay_1.0.bb
+++ b/packages/modplugplay/modplugplay_1.0.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 DESCRIPTION = "modplugplay is a commandline mod-like audio file player."
 SECTION = "console/multimedia"
-MAINTAINER = "Michael 'Mickey' Lauer"
 DEPENDS = "libmodplug"
 PR = "r1"
 
diff --git a/packages/moin/moin_1.2.2.bb b/packages/moin/moin_1.2.2.bb
index cd4c02e53d..ae275c7f98 100644
--- a/packages/moin/moin_1.2.2.bb
+++ b/packages/moin/moin_1.2.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A full fledged WikiWiki system written in Python"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/moin/moin-${PV}.tar.gz"
diff --git a/packages/monotone/monotone.inc b/packages/monotone/monotone.inc
index 96d552e4d0..0bade3a11c 100644
--- a/packages/monotone/monotone.inc
+++ b/packages/monotone/monotone.inc
@@ -1,6 +1,5 @@
 DESCRIPTION = "Monotone is a distributed Source Control System"
 HOMEPAGE = "http://www.venge.net/"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "MIT"
diff --git a/packages/motion/motion_3.2.6.bb b/packages/motion/motion_3.2.6.bb
index 212673f110..2d12802cbc 100644
--- a/packages/motion/motion_3.2.6.bb
+++ b/packages/motion/motion_3.2.6.bb
@@ -5,7 +5,6 @@ PR = "r0"
 LICENSE = "GPL"
 DEPENDS = "jpeg"
 PRIORITY = "optional"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/motion/motion-3.2.6.tar.gz"
 
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 93cdc856d1..38e6a85d76 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -5,7 +5,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/packages/mpeg2dec/mpeg2dec_0.4.0b.bb b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
index adccb35412..49e41b9fd8 100644
--- a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
+++ b/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/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb
index 1bf29fb6b1..59b9965aa4 100644
--- a/packages/mpfr/mpfr_2.1.1.bb
+++ b/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/packages/mpfr/mpfr_cvs.bb b/packages/mpfr/mpfr_cvs.bb
index e8f0faeeeb..fcea24633a 100644
--- a/packages/mpfr/mpfr_cvs.bb
+++ b/packages/mpfr/mpfr_cvs.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"
 PV = "0.0+cvs${SRCDATE}"
diff --git a/packages/mplayer/mplayer-common.bb b/packages/mplayer/mplayer-common.bb
index 93ddc975b9..3506b1c7a7 100644
--- a/packages/mplayer/mplayer-common.bb
+++ b/packages/mplayer/mplayer-common.bb
@@ -6,7 +6,6 @@
 # Date: 26-Mar-06
 
 DESCRIPTION = "Preconfigured mplayer preferences"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 
 ######################################################################################
diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb
index d0a23cc9fd..b38cdecc0f 100644
--- a/packages/mplayer/mplayer_1.0pre8.bb
+++ b/packages/mplayer/mplayer_1.0pre8.bb
@@ -18,7 +18,6 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
            file://libmpcodecs-ogg-include.patch;patch=1 \
            file://pld-onlyarm5.patch;patch=1"
 
-MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 PR = "r2"
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index 2a37efe3c6..118e71bcea 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -18,7 +18,6 @@ SRC_URI = "svn://svn.mplayerhq.hu/;module=mplayer \
            file://libmpcodecs-ogg-include.patch;patch=1 \
            file://pld-onlyarm5.patch;patch=1"
 
-MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
diff --git a/packages/msn-cap/msn-cap.bb b/packages/msn-cap/msn-cap.bb
index e59942f1b5..7b8edd5bc9 100644
--- a/packages/msn-cap/msn-cap.bb
+++ b/packages/msn-cap/msn-cap.bb
@@ -1,6 +1,5 @@
 SECTION = "network/misc"
 DESCRIPTION = "MSN Messenger sniffer"
-MAINTAINER = "Bob Davies (tyggerbob@gmail.com)"
 
 SRC_URI = "http://packetstorm.linuxsecurity.com/sniffers/msn-cap.c \
 	   file://Makefile"
diff --git a/packages/mt-daapd/mt-daapd.inc b/packages/mt-daapd/mt-daapd.inc
index 28b0a1e284..56692a3db8 100644
--- a/packages/mt-daapd/mt-daapd.inc
+++ b/packages/mt-daapd/mt-daapd.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "multi threaded daap server for POSIX Systems: iTunes Server."
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 DEPENDS = "zlib gdbm libid3tag"
 LICENSE = "GPL"
 
diff --git a/packages/mtools/mtools_3.9.9.bb b/packages/mtools/mtools_3.9.9.bb
index 71d200d96c..90b1cf5830 100644
--- a/packages/mtools/mtools_3.9.9.bb
+++ b/packages/mtools/mtools_3.9.9.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them."
 HOMEPAGE="http://mtools.linux.lu"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE="GPL"
 
 SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \
diff --git a/packages/mtr/mtr_0.65.bb b/packages/mtr/mtr_0.65.bb
index 2f6a79cc21..c7a437eccc 100644
--- a/packages/mtr/mtr_0.65.bb
+++ b/packages/mtr/mtr_0.65.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "mtr combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool."
 HOMEPAGE = "http://www.bitwizard.nl/mtr/"
 LICENSE = "GPLv2"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz"
 
 inherit autotools
diff --git a/packages/musicbrainz/libmusicbrainz_2.1.2.bb b/packages/musicbrainz/libmusicbrainz_2.1.2.bb
index 14eac7adce..43632d8670 100644
--- a/packages/musicbrainz/libmusicbrainz_2.1.2.bb
+++ b/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/packages/musicpd/glurp_0.11.6.bb b/packages/musicpd/glurp_0.11.6.bb
index ff702325cb..4d9449c904 100644
--- a/packages/musicpd/glurp_0.11.6.bb
+++ b/packages/musicpd/glurp_0.11.6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "glurp - frontend for mpd"
 HOMEPAGE = "http://www.musicpd.org/glurp.shtml"
 LICENSE = "GPLv2"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "gnome/multimedia"
 DEPENDS = "gtk+ libglade"
 PR = "r0"
diff --git a/packages/musicpd/gmpc_0.11.2.bb b/packages/musicpd/gmpc_0.11.2.bb
index 3aba7fcc6a..9468a07249 100644
--- a/packages/musicpd/gmpc_0.11.2.bb
+++ b/packages/musicpd/gmpc_0.11.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "GTK+ Frontend for mpd"
 HOMEPAGE = "http://www.musicpd.org/gmpc.shtml"
 LICENSE = "GPLv2"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "gnome/multimedia"
 DEPENDS = "gtk+ libglade gnome-vfs"
 PR = "r1"
diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb
index ae643b5e0a..256a2e5ea2 100644
--- a/packages/musicpd/mpc_0.11.2.bb
+++ b/packages/musicpd/mpc_0.11.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client"
 HOMEPAGE = "http://www.musicpd.org/mpc.shtml"
 LICENSE = "GPLv2"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "console/multimedia"
 PR = "r0"
 
diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb
index ceb491a192..1ba1fabd16 100644
--- a/packages/musicpd/mpd-alsa_0.11.5.bb
+++ b/packages/musicpd/mpd-alsa_0.11.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa support"
 HOMEPAGE = "http://www.musicpd.org"
 LICENSE = "GPLv2"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/multimedia"
 DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv"
 RDEPENDS = "libao-alsa"
diff --git a/packages/musicpd/mpd_0.11.2.bb b/packages/musicpd/mpd_0.11.2.bb
index 395d69e79e..493f677a50 100644
--- a/packages/musicpd/mpd_0.11.2.bb
+++ b/packages/musicpd/mpd_0.11.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Music Player Daemon (mpd)"
 HOMEPAGE = "http://www.musicpd.org"
 LICENSE = "GPLv2"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/multimedia"
 DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile"
 PR = "r2"
diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb
index 95fe05cf41..37550784c8 100644
--- a/packages/musicpd/mpd_0.11.5.bb
+++ b/packages/musicpd/mpd_0.11.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Music Player Daemon (mpd)"
 HOMEPAGE = "http://www.musicpd.org"
 LICENSE = "GPLv2"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/multimedia"
 DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv"
 PR = "r7"
diff --git a/packages/musicpd/ncmpc_0.11.1.bb b/packages/musicpd/ncmpc_0.11.1.bb
index 12677b6c70..c687f9ea02 100644
--- a/packages/musicpd/ncmpc_0.11.1.bb
+++ b/packages/musicpd/ncmpc_0.11.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Ncurses based Music Player Daemon (mpd) Client"
 HOMEPAGE = "http://www.musicpd.org/ncmpc.shtml"
 LICENSE = "GPLv2"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "console/multimedia"
 DEPENDS = "ncurses glib-2.0"
 PR = "r0"
diff --git a/packages/mystun-server/mystun-server_cvs.bb b/packages/mystun-server/mystun-server_cvs.bb
index cfdf72f475..09766278b0 100644
--- a/packages/mystun-server/mystun-server_cvs.bb
+++ b/packages/mystun-server/mystun-server_cvs.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "STUN server used to determine IP behind NAT firewall"
 HOMEPAGE = "http://developer.berlios.de/projects/mystun/"
-MAINTAINER = "Sven-Ola Tuecke <sven-ola@gmx.de>"
 SECTION = "console/telephony"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb
index 37b75b6a23..7f8dc739e1 100644
--- a/packages/mythtv/mythtv_0.18.1.bb
+++ b/packages/mythtv/mythtv_0.18.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A full featured personal video recorder system."
 HOMEPAGE = "http://www.mythtv.org"
 LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "x11/multimedia"
 PR = "r1"
 
diff --git a/packages/nail/nail_11.21.bb b/packages/nail/nail_11.21.bb
index a4818c286a..8c19adfd0d 100644
--- a/packages/nail/nail_11.21.bb
+++ b/packages/nail/nail_11.21.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Enhanced mailx client."
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 DEPENDS = "openssl"
 PR = "r2"
 LICENSE = "GPL"
diff --git a/packages/nasm/nasm_0.98.38.bb b/packages/nasm/nasm_0.98.38.bb
index 7faaf360f1..3b9bf36e17 100644
--- a/packages/nasm/nasm_0.98.38.bb
+++ b/packages/nasm/nasm_0.98.38.bb
@@ -1,6 +1,5 @@
 SECTION = "devel"
 DESCRIPTION = "General-purpose x86 assembler"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)'
 LICENSE = "GPL"
 SECTION = "dev-lang"
diff --git a/packages/nbd/nbd_2.8.4.bb b/packages/nbd/nbd_2.8.4.bb
index 49eda970b0..103c2053c7 100644
--- a/packages/nbd/nbd_2.8.4.bb
+++ b/packages/nbd/nbd_2.8.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Network Block Device"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://nbd.sourceforge.net"
-MAINTAINER = "Holger Freyther <freyther@handhelds.org>"
 
 DEPENDS = "glib-2.0"
 
diff --git a/packages/ndisc6/ndisc6_0.6.7.bb b/packages/ndisc6/ndisc6_0.6.7.bb
index a9e2118b39..1ce880136c 100644
--- a/packages/ndisc6/ndisc6_0.6.7.bb
+++ b/packages/ndisc6/ndisc6_0.6.7.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION = "This package includes some useful diagnostics tools for \
 IPv6 networks, including ndisc6, rdisc6, tcptraceroute6 and traceroute6."
 SECTION = "console/network"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 HOMEPAGE = "http://www.simphalempin.com/dev/ndisc6/"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/net-snmp/net-snmp_5.1.2.bb b/packages/net-snmp/net-snmp_5.1.2.bb
index 25c9e62f7c..35743337a1 100644
--- a/packages/net-snmp/net-snmp_5.1.2.bb
+++ b/packages/net-snmp/net-snmp_5.1.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Various tools relating to the Simple Network Management Protocol"
 HOMEPAGE = "http://www.net-snmp.org/"
 LICENSE = "BSD"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 DEPENDS = "openssl"
 PR = "r1"
 
diff --git a/packages/netcat/netcat_0.7.1.bb b/packages/netcat/netcat_0.7.1.bb
index 3ed1c3d6c4..a6361f0731 100644
--- a/packages/netcat/netcat_0.7.1.bb
+++ b/packages/netcat/netcat_0.7.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "GNU Netcat"
 HOMEPAGE = "http://netcat.sourceforge.net"
 LICENSE = "GPLv2"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "console/networking"
 PR = "r1"
 
diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb
index 80a88d384e..69268a8141 100644
--- a/packages/networkmanager/networkmanager_0.6.4.bb
+++ b/packages/networkmanager/networkmanager_0.6.4.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNOME NetworkManager port"
 SECTION = "net/misc"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.gnome.org"
-MAINTAINER = "Milan Plzik <mmp@handhelds.org>"
 PRIORITY = "optional"
 DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade"
 RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme"
diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb
index 076ef4cff1..d91658346b 100644
--- a/packages/nfs-utils/nfs-utils_1.0.6.bb
+++ b/packages/nfs-utils/nfs-utils_1.0.6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "userspace utilities for kernel nfs"
 PRIORITY = "optional"
 SECTION = "console/network"
-MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
 PR = "r7"
 
diff --git a/packages/nis/nis-all.bb b/packages/nis/nis-all.bb
index 5018a25ca1..a0af47b0cb 100644
--- a/packages/nis/nis-all.bb
+++ b/packages/nis/nis-all.bb
@@ -4,7 +4,6 @@
 PR = "r0"
 DESCRIPTION="NIS services"
 HOMEPAGE="http://www.linux-nis.org/nis/"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "console/networking"
 PRIORITY = "optional"
 LICENSE = "GPL-2"
diff --git a/packages/nis/nis.inc b/packages/nis/nis.inc
index 269904f957..479718cf5e 100644
--- a/packages/nis/nis.inc
+++ b/packages/nis/nis.inc
@@ -5,7 +5,6 @@
 # the rpcsvc functionality is not present in uclibc
 DESCRIPTION ?= "NIS Server and Tools"
 HOMEPAGE ?= "http://www.linux-nis.org/nis/"
-MAINTAINER ?= "John Bowler <jbowler@acm.org>"
 SECTION ?= "console/networking"
 PRIORITY ?= "optional"
 LICENSE ?= "GPL-2"
diff --git a/packages/nmap/nmap_3.81.bb b/packages/nmap/nmap_3.81.bb
index 8d08fee21c..62bb86e7ba 100644
--- a/packages/nmap/nmap_3.81.bb
+++ b/packages/nmap/nmap_3.81.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Nmap is a command line portscanner."
 HOMEPAGE = "http://www.insecure.org/nmap/"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "libpcap libpcre"
diff --git a/packages/nmixer/nmixer_2.0.bb b/packages/nmixer/nmixer_2.0.bb
index 0954d194bd..f6fe47fc8f 100644
--- a/packages/nmixer/nmixer_2.0.bb
+++ b/packages/nmixer/nmixer_2.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A text mode OSS soundmixer"
 SECTION = "console/multimedia"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
 SRC_URI = "http://www.stack.nl/~brama/projects/nmixer/src/nmixer-${PV}.tar.gz"
diff --git a/packages/nogravity/nogravity_2.0.bb b/packages/nogravity/nogravity_2.0.bb
index 1814d77a5a..b8db04f639 100644
--- a/packages/nogravity/nogravity_2.0.bb
+++ b/packages/nogravity/nogravity_2.0.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "3D arcade space shooter"
 HOMEPAGE = "http://www.realtech-vr.com/nogravity/"
 LICENSE = "GPL"
 SECTION = "x11/games"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "libsdl-x11 zlib libpng libsdl-mixer libogg libvorbis"
 PR = "r1"
 
diff --git a/packages/nonworking/aodv/aodv-modules_2.2.2.bb b/packages/nonworking/aodv/aodv-modules_2.2.2.bb
index ae28e11a5b..30df4d3ce1 100644
--- a/packages/nonworking/aodv/aodv-modules_2.2.2.bb
+++ b/packages/nonworking/aodv/aodv-modules_2.2.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "AODV is a routing protocol for ad hoc networks designed with mobile wireless devices in mind."
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.antd.nist.gov/wctg/aodv_kernel/kernel-aodv_v${PV}.tgz \
diff --git a/packages/nonworking/icecast/icecast_2.2.0.bb b/packages/nonworking/icecast/icecast_2.2.0.bb
index 7322af3087..c4738cb46f 100644
--- a/packages/nonworking/icecast/icecast_2.2.0.bb
+++ b/packages/nonworking/icecast/icecast_2.2.0.bb
@@ -1,5 +1,4 @@
 PR = "r4"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 LICENSE = "GPL-2"
 
 DEPENDS = "libvorbis libogg libxslt"
diff --git a/packages/nonworking/kde/arts_1.2.2.bb b/packages/nonworking/kde/arts_1.2.2.bb
index 5e4ffb8703..dd5340bbf8 100644
--- a/packages/nonworking/kde/arts_1.2.2.bb
+++ b/packages/nonworking/kde/arts_1.2.2.bb
@@ -1,6 +1,5 @@
 DEPENDS = "glib-2.0-native qt-x11-free-native"
 DESCRIPTION = "Analog Real Time Synthesizer... (ARTS)"
-MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
 LICENSE = "GPL"
 PRIOTITY = "optional"
 SECTION = "kde"
diff --git a/packages/nonworking/kgrok/kgrok_1.5.bb b/packages/nonworking/kgrok/kgrok_1.5.bb
index f70e46a30c..67b668efc8 100644
--- a/packages/nonworking/kgrok/kgrok_1.5.bb
+++ b/packages/nonworking/kgrok/kgrok_1.5.bb
@@ -4,7 +4,6 @@ scripts turn it into a phone list, todo list, notepad, and others. Encryption \
 optionally secures personal data."
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Thomas Driemeyer <thomas@bitrot.de>"
 HOMEPAGE = "http://www.bitrot.de/pda_kgrok.html"
diff --git a/packages/nonworking/linux/linux-mtx-1_2.4.24.bb b/packages/nonworking/linux/linux-mtx-1_2.4.24.bb
index b98f9fb638..20c7efc401 100644
--- a/packages/nonworking/linux/linux-mtx-1_2.4.24.bb
+++ b/packages/nonworking/linux/linux-mtx-1_2.4.24.bb
@@ -1,6 +1,5 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 KV = "${PV}"
 RDEPENDS = "mtd-utils"
diff --git a/packages/nonworking/monotone-viz/monotone-viz_0.11.bb b/packages/nonworking/monotone-viz/monotone-viz_0.11.bb
index 6470fe7bb7..419fe9d0f4 100644
--- a/packages/nonworking/monotone-viz/monotone-viz_0.11.bb
+++ b/packages/nonworking/monotone-viz/monotone-viz_0.11.bb
@@ -1,7 +1,6 @@
 DESCRIPTION =	"Monotone-viz is a small GTK+ application that visualizes monotone ancestry graphs."
 DEPENDS =	"gtk+ libgnomecanvas lablgtk sqlite3 ocaml-cross"
 RDEPENDS =	"graphviz"
-MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 
 SRC_URI =	"http://oandrieu.nerim.net/monotone-viz/monotone-viz-0.11.tar.gz"
diff --git a/packages/nonworking/pixdev/pixdev-stable_0.1.bb b/packages/nonworking/pixdev/pixdev-stable_0.1.bb
index f2dd8294e0..f182036cb8 100644
--- a/packages/nonworking/pixdev/pixdev-stable_0.1.bb
+++ b/packages/nonworking/pixdev/pixdev-stable_0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION="Pixil Operating Environment"
 SECTION="gui"
 PRIORITY="optional"
-MAINTAINER="Jordan Crouse <jordan@cosmicpenguin.net>"
 RDEPENDS="microwindows"
 DEPENDS="microwindows"
 
diff --git a/packages/nonworking/python/python-gsl_0.2.0.bb b/packages/nonworking/python/python-gsl_0.2.0.bb
index 4a504cc15e..f607a29acb 100644
--- a/packages/nonworking/python/python-gsl_0.2.0.bb
+++ b/packages/nonworking/python/python-gsl_0.2.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION=GNU Scientific Library Python Bindings
 SECTION=base
 PRIORITY=optional
-MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 RDEPENDS=python-core gsl
 DEPENDS=gsl
 SRCNAME=pygsl
diff --git a/packages/nonworking/python/python-pycap_0.1.6.bb b/packages/nonworking/python/python-pycap_0.1.6.bb
index 2bcf37a594..48e62c4e91 100644
--- a/packages/nonworking/python/python-pycap_0.1.6.bb
+++ b/packages/nonworking/python/python-pycap_0.1.6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python Packet Capture Library"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
 RDEPENDS = "python-core"
 DEPENDS = "libpcap-0.7.2 libnet-1.1.1"
 SRCNAME = "pycap"
diff --git a/packages/nonworking/python/python-pyx_0.6.bb b/packages/nonworking/python/python-pyx_0.6.bb
index 8bdaedfc67..ced0b42fee 100644
--- a/packages/nonworking/python/python-pyx_0.6.bb
+++ b/packages/nonworking/python/python-pyx_0.6.bb
@@ -3,7 +3,6 @@ It provides both an abstraction of PostScript and a TeX/LaTeX interface. Complex
 2d and 3d plots in publication-ready quality are built out of these primitives."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 RDEPENDS = "python-core"
 DEPENDS = "kpsewhich-native"
 SRCNAME = "PyX"
diff --git a/packages/nonworking/qtella/qtella_0.6.5.bb b/packages/nonworking/qtella/qtella_0.6.5.bb
index f735962ab9..80e975b578 100644
--- a/packages/nonworking/qtella/qtella_0.6.5.bb
+++ b/packages/nonworking/qtella/qtella_0.6.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A GNet Client for Qtopia/Opie based Palmtop Environments"
 SECTION = "opie"
 PRIORITY = "optional"
-MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/qtella/qtella-${PV}.tar.gz"
 
diff --git a/packages/nonworking/r/r_1.9.1.bb b/packages/nonworking/r/r_1.9.1.bb
index aece98b7d6..d9c6848262 100644
--- a/packages/nonworking/r/r_1.9.1.bb
+++ b/packages/nonworking/r/r_1.9.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "R is GNU S, a freely available language and environment for statistical computing and \
 graphics which provides a wide variety of statistical and graphical techniques: \
 linear and nonlinear modelling, statistical tests, time series analysis, classification, clustering, etc."
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "http://cran.r-mirror.de/src/base/R-${PV}.tgz"
 S = "${WORKDIR}/R-${PV}"
diff --git a/packages/nonworking/r/r_2.0.0.bb b/packages/nonworking/r/r_2.0.0.bb
index 17bb3b5ab0..a7286fef1b 100644
--- a/packages/nonworking/r/r_2.0.0.bb
+++ b/packages/nonworking/r/r_2.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "R is GNU S, a freely available language and environment for statistical computing \
 and graphics which provides a wide variety of statistical and graphical techniques: \
 linear and nonlinear modelling, statistical tests, time series analysis, classification, clustering, etc."
-MAINTAINER = "Simon Pickering <S.G.Pickering@bath.ac.uk>"
 SECTION = "console/scientific"
 PRIORITY = "optional"
 DEPENDS = "ncurses readline less perl-native r-native"
diff --git a/packages/nonworking/snmpz/snmpz_1.1.bb b/packages/nonworking/snmpz/snmpz_1.1.bb
index 5cc0c287b2..b49989f89c 100644
--- a/packages/nonworking/snmpz/snmpz_1.1.bb
+++ b/packages/nonworking/snmpz/snmpz_1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION="A MIB Browser for Opie/Qtopia"
 SECTION="base"
 PRIORITY="optional"
-MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 LICENSE="GPL"
 DEPENDS=virtual/libqpe snmp++
 
diff --git a/packages/nonworking/traceproto/traceproto_1.1.0.bb b/packages/nonworking/traceproto/traceproto_1.1.0.bb
index 0e4c93f770..e9a1ebe6e4 100644
--- a/packages/nonworking/traceproto/traceproto_1.1.0.bb
+++ b/packages/nonworking/traceproto/traceproto_1.1.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Traceproto is a traceroute replacement that allows the user \
 to specify the protocol and port to trace to. It currently supports TCP, UDP, and ICMP traces."
 DEPENDS = "libpcap"
 SECTION = "console/network"
-MAINTAINER = "Michael 'Mickey' Lauer"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/traceproto/traceproto-${PV}.tar.gz"
diff --git a/packages/nonworking/xfree86/xfree86_4.3.0.bb b/packages/nonworking/xfree86/xfree86_4.3.0.bb
index 84dc69ecb6..c4971a24ea 100644
--- a/packages/nonworking/xfree86/xfree86_4.3.0.bb
+++ b/packages/nonworking/xfree86/xfree86_4.3.0.bb
@@ -1,6 +1,5 @@
 SECTION="base"
 PRIORITY="required"
-MAINTAINER="Greg Gilbert <greg@treke.net>"
 DEPENDS=zlib tslib ncurses
 
 SRC_URI = "ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-1.tgz;"
diff --git a/packages/nonworking/xmlbench/xmlbench_1.3.1.bb b/packages/nonworking/xmlbench/xmlbench_1.3.1.bb
index d574ace77b..d8d2159280 100644
--- a/packages/nonworking/xmlbench/xmlbench_1.3.1.bb
+++ b/packages/nonworking/xmlbench/xmlbench_1.3.1.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPLv2"
 DEPENDS = "libxml2 expat"
 
diff --git a/packages/nonworking/zaurss/zaurss_0.4.2.bb b/packages/nonworking/zaurss/zaurss_0.4.2.bb
index 1a1da80d24..4ed8897050 100644
--- a/packages/nonworking/zaurss/zaurss_0.4.2.bb
+++ b/packages/nonworking/zaurss/zaurss_0.4.2.bb
@@ -3,7 +3,6 @@ It can also work with NetFront3, and you can see RDF items with it. "
 SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://www.daionet.gr.jp/~knok/software/zaurss/"
 APPNAME = "zaurss"
 APPTYPE = "binary"
diff --git a/packages/nonworking/zethereal/zethereal_1.0.0.bb b/packages/nonworking/zethereal/zethereal_1.0.0.bb
index 54b60a5d4a..aaa3a34c36 100644
--- a/packages/nonworking/zethereal/zethereal_1.0.0.bb
+++ b/packages/nonworking/zethereal/zethereal_1.0.0.bb
@@ -3,7 +3,6 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "glib-1.2 openssl"
-MAINTAINER = "Michael 'Mickey' Lauer"
 HOMEPAGE = "http://www.cartel-info.fr/pbiondi/zaurus/"
 APPNAME = "zethereal"
 APPTYPE = "binary"
diff --git a/packages/notez/notez_1.1.0.bb b/packages/notez/notez_1.1.0.bb
index 36c1cf76b5..9b82b1adad 100644
--- a/packages/notez/notez_1.1.0.bb
+++ b/packages/notez/notez_1.1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "simple note-taking application"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Henning Holtschneider <hh@holtschneider.com>"
 HOMEPAGE = "http://www.holtschneider.com/notez/"
diff --git a/packages/nsd/nsd_2.0.0.bb b/packages/nsd/nsd_2.0.0.bb
index 27794804a0..0614337d5b 100644
--- a/packages/nsd/nsd_2.0.0.bb
+++ b/packages/nsd/nsd_2.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "NSD is an authoritative only, high performance, simple and opensource name server"
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "http://www.nlnetlabs.nl/downloads/nsd/nsd-${PV}.tar.gz"
 LICENSE = "nsd"
diff --git a/packages/nsqld/nsqld_0.5.3.bb b/packages/nsqld/nsqld_0.5.3.bb
index c6f44397db..3bf0aa4169 100644
--- a/packages/nsqld/nsqld_0.5.3.bb
+++ b/packages/nsqld/nsqld_0.5.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Server process for syncing"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Tim Teulings <tim@teulings.org>"
 LICENSE = "GPL"
 
 SRC_URI = "${GPE_MIRROR}/nsqld-${PV}.tar.gz"
diff --git a/packages/nvidia-drivers/nvidia-drivers.inc b/packages/nvidia-drivers/nvidia-drivers.inc
index 8a05d60590..c783f81be9 100644
--- a/packages/nvidia-drivers/nvidia-drivers.inc
+++ b/packages/nvidia-drivers/nvidia-drivers.inc
@@ -4,7 +4,6 @@
 
 HOMEPAGE="http://www.nvidia.com/object/unix.html"
 DESCRIPTION="NVidia Graphics Driver Binary"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "NVIDIA"
 
 inherit module
diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb
index 8be477bd7b..2840bc8adb 100644
--- a/packages/nylon/nylon-scripts_cvs.bb
+++ b/packages/nylon/nylon-scripts_cvs.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://meshcube.org/meshwiki/NyLon"
 DEPENDS = "hostap-utils"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPLv2"
 SRCDATE = "20060923"
 PV = "1.0.0+cvs${SRCDATE}"
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index 21c588e78a..883a5961f1 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "statistics & graphing for nylon"
 RDEPENDS = "rrdtool"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPLv2"
 SRCDATE = "20050909"
 PV = "1.0.0+cvs${SRCDATE}"
diff --git a/packages/nylon/simple-firewall.bb b/packages/nylon/simple-firewall.bb
index 408faf9f29..4a99d8a851 100644
--- a/packages/nylon/simple-firewall.bb
+++ b/packages/nylon/simple-firewall.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "simple firewall configuratiopn script"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
 SRCDATE = "20060810"
diff --git a/packages/nylon/yamonenv.bb b/packages/nylon/yamonenv.bb
index 2c2fb3cbb7..e963d913ee 100644
--- a/packages/nylon/yamonenv.bb
+++ b/packages/nylon/yamonenv.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Reads YAMON environment-variables"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Michael Stickel <michael.stickel@4g-systems.biz>"
 LICENSE = "GPL"
 SRCDATE = "20050909"
 PV = "1.0.0+cvs${SRCDATE}"
diff --git a/packages/octave/octave_2.1.63.bb b/packages/octave/octave_2.1.63.bb
index 0dcb2c7e77..c042621381 100644
--- a/packages/octave/octave_2.1.63.bb
+++ b/packages/octave/octave_2.1.63.bb
@@ -5,7 +5,6 @@ and for performing other numerical experiments using a language that is mostly c
 It may also be used as a batch-oriented language." 
 SECTION = "console/util"
 DEPENDS = "readline ncurses"
-MAINTAINER = "Simon Pickering <S.G.Pickering@bath.ac.uk>"
 SRC_URI = "ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-${PV}.tar.gz"
 
 inherit autotools
diff --git a/packages/octave/octave_2.1.71.bb b/packages/octave/octave_2.1.71.bb
index 0dcb2c7e77..c042621381 100644
--- a/packages/octave/octave_2.1.71.bb
+++ b/packages/octave/octave_2.1.71.bb
@@ -5,7 +5,6 @@ and for performing other numerical experiments using a language that is mostly c
 It may also be used as a batch-oriented language." 
 SECTION = "console/util"
 DEPENDS = "readline ncurses"
-MAINTAINER = "Simon Pickering <S.G.Pickering@bath.ac.uk>"
 SRC_URI = "ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-${PV}.tar.gz"
 
 inherit autotools
diff --git a/packages/ode/ode_0.5.bb b/packages/ode/ode_0.5.bb
index 95fd2657cd..3b287d4b36 100644
--- a/packages/ode/ode_0.5.bb
+++ b/packages/ode/ode_0.5.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "ODE is an Open Source Physics Engine."
 SECTION = "libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 LICENSE = "LGPL"
 
diff --git a/packages/offlineimap/offlineimap_4.0.11.bb b/packages/offlineimap/offlineimap_4.0.11.bb
index 80c3187419..f60ed7271b 100644
--- a/packages/offlineimap/offlineimap_4.0.11.bb
+++ b/packages/offlineimap/offlineimap_4.0.11.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "OfflineIMAP is a tool to simplify your e-mail reading."
 HOMEPAGE = "http://gopher.quux.org:70/devel/offlineimap"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/network"
 LICENSE = "GPL PSF"
 RDEPENDS = "python-re python-netclient python-lang \
diff --git a/packages/offlineimap/offlineimap_4.0.9.bb b/packages/offlineimap/offlineimap_4.0.9.bb
index 6490e5d6de..87a8a37a5e 100644
--- a/packages/offlineimap/offlineimap_4.0.9.bb
+++ b/packages/offlineimap/offlineimap_4.0.9.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "OfflineIMAP is a tool to simplify your e-mail reading."
 HOMEPAGE = "http://gopher.quux.org:70/devel/offlineimap"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/network"
 LICENSE = "GPL PSF"
 
diff --git a/packages/olsrd/olsrd.inc b/packages/olsrd/olsrd.inc
index bd511961cb..96341d9d88 100644
--- a/packages/olsrd/olsrd.inc
+++ b/packages/olsrd/olsrd.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "OLSR mesh routing daemon"
 HOMEPAGE = "http://www.olsr.org"
 DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "BSD"
diff --git a/packages/olsrd/olsrd_0.4.8.bb b/packages/olsrd/olsrd_0.4.8.bb
index 9d2e43ac3f..98a6344fb7 100644
--- a/packages/olsrd/olsrd_0.4.8.bb
+++ b/packages/olsrd/olsrd_0.4.8.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "OLSR mesh routing daemon"
 HOMEPAGE = "http://www.olsr.org"
 DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "BSD"
diff --git a/packages/olsrd/olsrd_cvs.bb b/packages/olsrd/olsrd_cvs.bb
index 697d279848..1584281cbc 100644
--- a/packages/olsrd/olsrd_cvs.bb
+++ b/packages/olsrd/olsrd_cvs.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "OLSR mesh routing daemon"
 HOMEPAGE = "http://www.olsr.org"
 DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "BSD"
diff --git a/packages/omnievents/omnievents_2.6.1.bb b/packages/omnievents/omnievents_2.6.1.bb
index 779dd9a84e..827719ed20 100644
--- a/packages/omnievents/omnievents_2.6.1.bb
+++ b/packages/omnievents/omnievents_2.6.1.bb
@@ -2,7 +2,6 @@ PR = "r0"
 DESCRIPTION = "OmniEvent service for omniORB"
 SECTION = "devel"
 PRIORITY = "optional"
-MAINTAINER = "Philip Balister <philip@balister.org>"
 LICENSE = "LGPL"
 
 DEPENDS = omniorb
diff --git a/packages/omniorb/omniorb_4.0.5.bb b/packages/omniorb/omniorb_4.0.5.bb
index 83b9e2ed0c..ea9c24f476 100644
--- a/packages/omniorb/omniorb_4.0.5.bb
+++ b/packages/omniorb/omniorb_4.0.5.bb
@@ -2,7 +2,6 @@ PR = "r0"
 DESCRIPTION = "OmniORB High Performance ORB"
 SECTION = "devel"
 PRIORITY = "optional"
-MAINTAINER = "Philip Balister <philip@balister.org>"
 LICENSE = "LGPL"
 
 DEPENDS = omniorb-native
diff --git a/packages/omniorb/omniorb_4.0.7.bb b/packages/omniorb/omniorb_4.0.7.bb
index 0ef6bdac03..3824b293b3 100644
--- a/packages/omniorb/omniorb_4.0.7.bb
+++ b/packages/omniorb/omniorb_4.0.7.bb
@@ -2,7 +2,6 @@ PR = "r0"
 DESCRIPTION = "OmniORB High Performance ORB"
 SECTION = "devel"
 PRIORITY = "optional"
-MAINTAINER = "Philip Balister <philip@balister.org>"
 LICENSE = "LGPL"
 
 DEPENDS = omniorb-native
diff --git a/packages/openh323/openh323_1.13.5.4.bb b/packages/openh323/openh323_1.13.5.4.bb
index 97e7594441..3fde0c3217 100644
--- a/packages/openh323/openh323_1.13.5.4.bb
+++ b/packages/openh323/openh323_1.13.5.4.bb
@@ -4,7 +4,6 @@
 
 HOMEPAGE="http://www.openh323.org/"
 DESCRIPTION="Open Soure ITU-T H.323 teleconferencing protocol implementation."
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
 
 SRC_URI="http://http.us.debian.org/debian/pool/main/o/${PN}/${PN}_${PV}.orig.tar.gz \
diff --git a/packages/openldap/openldap_2.2.29.bb b/packages/openldap/openldap_2.2.29.bb
index cbb968f673..fa27b4d0a7 100644
--- a/packages/openldap/openldap_2.2.29.bb
+++ b/packages/openldap/openldap_2.2.29.bb
@@ -2,7 +2,6 @@
 #
 DESCRIPTION = "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol."
 HOMEPAGE = "http://www.OpenLDAP.org/license.html"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 PRIORITY = "optional"
 # The OpenLDAP Public License - see the HOMEPAGE - defines
 # the license.  www.openldap.org claims this is Open Source
diff --git a/packages/openldap/openldap_2.3.11.bb b/packages/openldap/openldap_2.3.11.bb
index 70e6547146..61e2463b1f 100644
--- a/packages/openldap/openldap_2.3.11.bb
+++ b/packages/openldap/openldap_2.3.11.bb
@@ -2,7 +2,6 @@
 #
 DESCRIPTION = "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol."
 HOMEPAGE = "http://www.OpenLDAP.org/license.html"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 PRIORITY = "optional"
 # The OpenLDAP Public License - see the HOMEPAGE - defines
 # the license.  www.openldap.org claims this is Open Source
diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb
index d13f6d3520..9358508cb0 100644
--- a/packages/openntpd/openntpd_3.7p1.bb
+++ b/packages/openntpd/openntpd_3.7p1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "OpenNTPD is a FREE, easy to use implementation of the \
 Network Time Protocol."
 HOMEPAGE = "http://www.openntpd.org/"
 SECTION = "console/network"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "BSD"
 DEPENDS += "openssl"
 DEPENDS = "timezones"
diff --git a/packages/openntpd/openntpd_3.9p1.bb b/packages/openntpd/openntpd_3.9p1.bb
index f7dd0beee2..9373bda202 100644
--- a/packages/openntpd/openntpd_3.9p1.bb
+++ b/packages/openntpd/openntpd_3.9p1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "OpenNTPD is a FREE, easy to use implementation of the \
 Network Time Protocol."
 HOMEPAGE = "http://www.openntpd.org/"
 SECTION = "console/network"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "BSD"
 DEPENDS += "openssl"
 DEPENDS = "timezones"
diff --git a/packages/openssh/openssh_3.8p1.bb b/packages/openssh/openssh_3.8p1.bb
index 48fda6285f..2c830982ee 100644
--- a/packages/openssh/openssh_3.8p1.bb
+++ b/packages/openssh/openssh_3.8p1.bb
@@ -10,7 +10,6 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \
 used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 PR="r3"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb
index 2c0e035c4b..86763a9275 100644
--- a/packages/openssh/openssh_4.0p1.bb
+++ b/packages/openssh/openssh_4.0p1.bb
@@ -14,7 +14,6 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \
 used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 PR = "r10"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
diff --git a/packages/openssh/openssh_4.3p2.bb b/packages/openssh/openssh_4.3p2.bb
index 36924c5a4a..810810acb6 100644
--- a/packages/openssh/openssh_4.3p2.bb
+++ b/packages/openssh/openssh_4.3p2.bb
@@ -14,7 +14,6 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \
 used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
diff --git a/packages/openswan/openswan_2.2.0.bb b/packages/openswan/openswan_2.2.0.bb
index 268ec805d0..e1423d30b7 100644
--- a/packages/openswan/openswan_2.2.0.bb
+++ b/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/packages/opensync/libopensync-plugin-file_0.18.bb b/packages/opensync/libopensync-plugin-file_0.18.bb
index 234413f114..293431d13e 100644
--- a/packages/opensync/libopensync-plugin-file_0.18.bb
+++ b/packages/opensync/libopensync-plugin-file_0.18.bb
@@ -5,7 +5,6 @@ LICENSE = "LGPL"
 DEPENDS = "libopensync"
 RRECOMMENDS = "multisync"
 HOMEPAGE = "http://www.opensync.org/"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/opensync/libopensync-plugin-gpe_0.18.bb b/packages/opensync/libopensync-plugin-gpe_0.18.bb
index e1c59d328f..6bf2e863d3 100644
--- a/packages/opensync/libopensync-plugin-gpe_0.18.bb
+++ b/packages/opensync/libopensync-plugin-gpe_0.18.bb
@@ -5,7 +5,6 @@ LICENSE = "LGPL"
 DEPENDS = "libopensync"
 RRECOMMENDS = "multisync"
 HOMEPAGE = "http://www.opensync.org/"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/opensync/libopensync-plugin-irmc_0.18.bb b/packages/opensync/libopensync-plugin-irmc_0.18.bb
index 1e3b246a95..8ab66f8130 100644
--- a/packages/opensync/libopensync-plugin-irmc_0.18.bb
+++ b/packages/opensync/libopensync-plugin-irmc_0.18.bb
@@ -5,7 +5,6 @@ LICENSE = "LGPL"
 DEPENDS = "libopensync openobex bluez-libs"
 RRECOMMENDS = "multisync"
 HOMEPAGE = "http://www.opensync.org/"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/opensync/libopensync_0.18.bb b/packages/opensync/libopensync_0.18.bb
index eef443fc98..5a2e5be2ba 100644
--- a/packages/opensync/libopensync_0.18.bb
+++ b/packages/opensync/libopensync_0.18.bb
@@ -4,7 +4,6 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/libopensync-${PV}.tar.gz"
 LICENSE = "LGPL"
 DEPENDS = "sqlite3 libxml2 zlib glib-2.0"
 HOMEPAGE = "http://www.opensync.org/"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/opensync/multisync_0.90.18.bb b/packages/opensync/multisync_0.90.18.bb
index d10c816c41..4134ff2ebc 100644
--- a/packages/opensync/multisync_0.90.18.bb
+++ b/packages/opensync/multisync_0.90.18.bb
@@ -4,7 +4,6 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/${P}.tar.gz"
 LICENSE = "GPL"
 DEPENDS = "libopensync"
 HOMEPAGE = "http://www.opensync.org/"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/opensync/syncml-client_0.1.bb b/packages/opensync/syncml-client_0.1.bb
index 0b71abcf0d..7a99236d90 100644
--- a/packages/opensync/syncml-client_0.1.bb
+++ b/packages/opensync/syncml-client_0.1.bb
@@ -4,6 +4,5 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ curl gconf"
 HOMEPAGE = "http://hem.bredband.net/miko22/"
 DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector." 
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 inherit autotools pkgconfig
diff --git a/packages/openvpn/openvpn_2.0.2.bb b/packages/openvpn/openvpn_2.0.2.bb
index 60895c9159..badac9b551 100644
--- a/packages/openvpn/openvpn_2.0.2.bb
+++ b/packages/openvpn/openvpn_2.0.2.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "A full-featured SSL VPN solution via tun device."
 HOMEPAGE = "http://openvpn.sourceforge.net"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 PRIORITY = "optional"
diff --git a/packages/openvpn/openvpn_2.0.bb b/packages/openvpn/openvpn_2.0.bb
index 5ea2e02d69..bea71b9c44 100644
--- a/packages/openvpn/openvpn_2.0.bb
+++ b/packages/openvpn/openvpn_2.0.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "A full-featured SSL VPN solution via tun device."
 HOMEPAGE = "http://openvpn.sourceforge.net"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPLv2"
 PRIORITY = "optional"
 DEPENDS = "lzo openssl"
diff --git a/packages/openzaurus/openzaurus-version.bb b/packages/openzaurus/openzaurus-version.bb
index 925c54ef5b..f80fb3822d 100644
--- a/packages/openzaurus/openzaurus-version.bb
+++ b/packages/openzaurus/openzaurus-version.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 PV = ${DISTRO_VERSION}
 
 do_compile() {
diff --git a/packages/opie-aboutapplet/opie-aboutapplet.inc b/packages/opie-aboutapplet/opie-aboutapplet.inc
index 62a3fec4d1..15e300cbc2 100644
--- a/packages/opie-aboutapplet/opie-aboutapplet.inc
+++ b/packages/opie-aboutapplet/opie-aboutapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "About Opie"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Rajko Albrecht <alwin@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "aboutapplet"
 
diff --git a/packages/opie-addressbook/opie-addressbook.inc b/packages/opie-addressbook/opie-addressbook.inc
index a1ed836796..c98c354caf 100644
--- a/packages/opie-addressbook/opie-addressbook.inc
+++ b/packages/opie-addressbook/opie-addressbook.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Contacts"
 SECTION = "opie/pim"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-pics"
 APPNAME = "addressbook"
diff --git a/packages/opie-advancedfm/opie-advancedfm.inc b/packages/opie-advancedfm/opie-advancedfm.inc
index c8fd52b1bb..a74ff4ba94 100644
--- a/packages/opie-advancedfm/opie-advancedfm.inc
+++ b/packages/opie-advancedfm/opie-advancedfm.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Advanced Filemanager"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "advancedfm"
 RDEPENDS = "opie-advancedfm-pics"
diff --git a/packages/opie-alarm/opie-alarm.inc b/packages/opie-alarm/opie-alarm.inc
index 4b3a736f20..d193653924 100644
--- a/packages/opie-alarm/opie-alarm.inc
+++ b/packages/opie-alarm/opie-alarm.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Alarm"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "apmd"
 RDEPENDS = "apmd"
diff --git a/packages/opie-appearance/opie-appearance.inc b/packages/opie-appearance/opie-appearance.inc
index 83de8fdbc7..5daca3b68e 100644
--- a/packages/opie-appearance/opie-appearance.inc
+++ b/packages/opie-appearance/opie-appearance.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Appearance settings dialog for the Opie environment"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libqtaux2"
 APPNAME = "appearance"
diff --git a/packages/opie-aqpkg/opie-aqpkg.inc b/packages/opie-aqpkg/opie-aqpkg.inc
index b3b614010b..52ba634ad4 100644
--- a/packages/opie-aqpkg/opie-aqpkg.inc
+++ b/packages/opie-aqpkg/opie-aqpkg.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Package Manager"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "aqpkg"
 
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet.inc b/packages/opie-autorotateapplet/opie-autorotateapplet.inc
index b1e6cd5498..4d0f36f54d 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet.inc
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Applet to disable the automatic screen rotation on Zaurus C-models"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "autorotateapplet"
 
diff --git a/packages/opie-backgammon/opie-backgammon.inc b/packages/opie-backgammon/opie-backgammon.inc
index 3fe004c70c..60230953ca 100644
--- a/packages/opie-backgammon/opie-backgammon.inc
+++ b/packages/opie-backgammon/opie-backgammon.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Backgammon Game"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "backgammon"
 
diff --git a/packages/opie-backup/opie-backup.inc b/packages/opie-backup/opie-backup.inc
index ce6eeb8753..db3c037303 100644
--- a/packages/opie-backup/opie-backup.inc
+++ b/packages/opie-backup/opie-backup.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Backup and Restore utility."
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "backup"
 
diff --git a/packages/opie-bartender/opie-bartender.inc b/packages/opie-bartender/opie-bartender.inc
index 9ffffb98ba..633dcc0c91 100644
--- a/packages/opie-bartender/opie-bartender.inc
+++ b/packages/opie-bartender/opie-bartender.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Bartender drink receipe database"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "bartender"
 
diff --git a/packages/opie-batteryapplet/opie-batteryapplet.inc b/packages/opie-batteryapplet/opie-batteryapplet.inc
index 3df9f40f00..b01e21b0f0 100644
--- a/packages/opie-batteryapplet/opie-batteryapplet.inc
+++ b/packages/opie-batteryapplet/opie-batteryapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Battery Monitor applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "batteryapplet"
 
diff --git a/packages/opie-bluepin/opie-bluepin.inc b/packages/opie-bluepin/opie-bluepin.inc
index c618f403bc..3514934343 100644
--- a/packages/opie-bluepin/opie-bluepin.inc
+++ b/packages/opie-bluepin/opie-bluepin.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "Opie BluePin"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 DEPENDS = "libopietooth1"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "bluepin"
 APPTYPE = "binary"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet.inc b/packages/opie-bluetoothapplet/opie-bluetoothapplet.inc
index 57930e40c0..c8f06984b0 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet.inc
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Bluetooth Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libopietooth1"
 APPNAME = "bluetoothapplet"
diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
index a2fa2e83a1..30acc59f10 100644
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
@@ -3,7 +3,6 @@ SECTION = "opie/settings"
 PRIORITY = "optional"
 DEPENDS = "libopietooth1 obexftp"
 RDEPENDS = "opie-bluepin"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "bluetooth-manager"
 
diff --git a/packages/opie-bounce/opie-bounce.inc b/packages/opie-bounce/opie-bounce.inc
index c4bc276385..012e7eaec2 100644
--- a/packages/opie-bounce/opie-bounce.inc
+++ b/packages/opie-bounce/opie-bounce.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "bounce"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "bounce"
 
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet.inc b/packages/opie-brightnessapplet/opie-brightnessapplet.inc
index 3d799802fd..0db87dbb98 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet.inc
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Brightness Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "brightnessapplet"
 
diff --git a/packages/opie-button-settings/opie-button-settings.inc b/packages/opie-button-settings/opie-button-settings.inc
index 733b7d9a5d..fe611a5202 100644
--- a/packages/opie-button-settings/opie-button-settings.inc
+++ b/packages/opie-button-settings/opie-button-settings.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie device buttons settings dialog"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-button-settings-pics"
 APPNAME = "buttonsettings"
diff --git a/packages/opie-buzzword/opie-buzzword.inc b/packages/opie-buzzword/opie-buzzword.inc
index 90f35c531a..afb0c13c65 100644
--- a/packages/opie-buzzword/opie-buzzword.inc
+++ b/packages/opie-buzzword/opie-buzzword.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "BuzzWord Bingo"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "buzzword"
 
diff --git a/packages/opie-calculator/opie-calculator.inc b/packages/opie-calculator/opie-calculator.inc
index d4c46e9eb4..f2c4ddeab7 100644
--- a/packages/opie-calculator/opie-calculator.inc
+++ b/packages/opie-calculator/opie-calculator.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Calculator"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "calculator"
 
diff --git a/packages/opie-camera/opie-camera.inc b/packages/opie-camera/opie-camera.inc
index 9dae4c218c..1e42ac8a2a 100644
--- a/packages/opie-camera/opie-camera.inc
+++ b/packages/opie-camera/opie-camera.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Camera, Photo and Video Capturing Application for the Sharp CF-AG06 camera"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "sharp-camera-support"
 APPNAME = "camera"
diff --git a/packages/opie-cardmon/opie-cardmon.inc b/packages/opie-cardmon/opie-cardmon.inc
index 11a31b8e85..06553eec02 100644
--- a/packages/opie-cardmon/opie-cardmon.inc
+++ b/packages/opie-cardmon/opie-cardmon.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "CF/PCMCIA Card Monitor applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "cardmonapplet"
 I18N_FILES = "libcardmonapplet.ts"
diff --git a/packages/opie-checkbook/opie-checkbook.inc b/packages/opie-checkbook/opie-checkbook.inc
index c227b65723..fd2a9b2f33 100644
--- a/packages/opie-checkbook/opie-checkbook.inc
+++ b/packages/opie-checkbook/opie-checkbook.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Checkbook"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "checkbook"
 
diff --git a/packages/opie-citytime/opie-citytime.inc b/packages/opie-citytime/opie-citytime.inc
index 4704e253db..a2fe0972af 100644
--- a/packages/opie-citytime/opie-citytime.inc
+++ b/packages/opie-citytime/opie-citytime.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Time-zone / world clock settings"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RRECOMMENDS = "timezones"
 
diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet.inc b/packages/opie-clipboardapplet/opie-clipboardapplet.inc
index b0340c0f1a..9384f7f2ab 100644
--- a/packages/opie-clipboardapplet/opie-clipboardapplet.inc
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Clipboard applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "clipboardapplet"
 
diff --git a/packages/opie-clock/opie-clock.inc b/packages/opie-clock/opie-clock.inc
index c525405468..131ca04a5a 100644
--- a/packages/opie-clock/opie-clock.inc
+++ b/packages/opie-clock/opie-clock.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Clock and stop-watch"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "clock"
 
diff --git a/packages/opie-clockapplet/opie-clockapplet.inc b/packages/opie-clockapplet/opie-clockapplet.inc
index ddf4d92677..112c11180a 100644
--- a/packages/opie-clockapplet/opie-clockapplet.inc
+++ b/packages/opie-clockapplet/opie-clockapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Clock applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "clockapplet"
 
diff --git a/packages/opie-confeditor/opie-confeditor.inc b/packages/opie-confeditor/opie-confeditor.inc
index addaa40bd5..33038cdfc5 100644
--- a/packages/opie-confeditor/opie-confeditor.inc
+++ b/packages/opie-confeditor/opie-confeditor.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "An enditor for the ~/Settings/*.conf files"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "confedit"
 
diff --git a/packages/opie-console/opie-console.inc b/packages/opie-console/opie-console.inc
index 8e66c09b1e..e58c3eadcd 100644
--- a/packages/opie-console/opie-console.inc
+++ b/packages/opie-console/opie-console.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Console Application"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-keytabs"
 RDEPENDS = "opie-keytabs"
diff --git a/packages/opie-dagger/opie-dagger.inc b/packages/opie-dagger/opie-dagger.inc
index 705ca26cb6..7ba8962867 100644
--- a/packages/opie-dagger/opie-dagger.inc
+++ b/packages/opie-dagger/opie-dagger.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Bible study program utilizing the Sword library."
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libopiecore2 libopieui2 sword"
 APPNAME = "dagger"
diff --git a/packages/opie-dasher/opie-dasher.inc b/packages/opie-dasher/opie-dasher.inc
index dbe7b1b9b2..9bc990947c 100644
--- a/packages/opie-dasher/opie-dasher.inc
+++ b/packages/opie-dasher/opie-dasher.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Dasher text input method"
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "qdasher"
 
diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin.inc b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin.inc
index 3ee20e5c96..6840edf854 100644
--- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin.inc
+++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin.inc
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "opie-datebook"
 APPNAME = "birthdayplugin"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 
 S = "${WORKDIR}/birthday"
 
diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin.inc b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin.inc
index a54b6211a2..4b3b7c940a 100644
--- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin.inc
+++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin.inc
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "opie-datebook"
 APPNAME = "chrisholidayplugin"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 
 S = "${WORKDIR}/christian"
 
diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin.inc b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin.inc
index 6a13db00a1..0ec79d0138 100644
--- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin.inc
+++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin.inc
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "opie-datebook"
 APPNAME = "nationaldayplugin"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 
 S = "${WORKDIR}/national"
 
diff --git a/packages/opie-datebook/opie-datebook.inc b/packages/opie-datebook/opie-datebook.inc
index 1f3dc65feb..6b4215984b 100644
--- a/packages/opie-datebook/opie-datebook.inc
+++ b/packages/opie-datebook/opie-datebook.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "A datebook/appointment manager"
 SECTION = "opie/pim"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-pics"
 APPNAME = "datebook"
diff --git a/packages/opie-deco-flat/opie-deco-flat.inc b/packages/opie-deco-flat/opie-deco-flat.inc
index fa3672bacc..a9e16735b6 100644
--- a/packages/opie-deco-flat/opie-deco-flat.inc
+++ b/packages/opie-deco-flat/opie-deco-flat.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Simple, flat window decoration style for Opie"
 SECTION = "opie/decorations"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "flat"
 
diff --git a/packages/opie-deco-liquid/opie-deco-liquid.inc b/packages/opie-deco-liquid/opie-deco-liquid.inc
index 9dfa333de7..877998061f 100644
--- a/packages/opie-deco-liquid/opie-deco-liquid.inc
+++ b/packages/opie-deco-liquid/opie-deco-liquid.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Liquid window decoration style for Opie"
 SECTION = "opie/decorations"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libqtaux2"
 APPNAME = "liquid"
diff --git a/packages/opie-deco-polished/opie-deco-polished.inc b/packages/opie-deco-polished/opie-deco-polished.inc
index a336ebb6cd..501dc4acdf 100644
--- a/packages/opie-deco-polished/opie-deco-polished.inc
+++ b/packages/opie-deco-polished/opie-deco-polished.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Polished window decoration style for Opie"
 SECTION = "opie/decorations"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "polished"
 
diff --git a/packages/opie-doctab/opie-doctab.inc b/packages/opie-doctab/opie-doctab.inc
index 514259602c..8a4124e584 100644
--- a/packages/opie-doctab/opie-doctab.inc
+++ b/packages/opie-doctab/opie-doctab.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "DocTab settings dialog for the Opie environment."
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "doctab"
 
diff --git a/packages/opie-drawpad/opie-drawpad.inc b/packages/opie-drawpad/opie-drawpad.inc
index 13e439d2eb..8b1f85807a 100644
--- a/packages/opie-drawpad/opie-drawpad.inc
+++ b/packages/opie-drawpad/opie-drawpad.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "A note taking program with basic draw tools"
 SECTION = "opie/pim"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libopiecore2 libopieui2 libqtaux2"
 APPNAME = "drawpad"
diff --git a/packages/opie-dvorak/opie-dvorak.inc b/packages/opie-dvorak/opie-dvorak.inc
index 6501dd09f7..7e4445dd42 100644
--- a/packages/opie-dvorak/opie-dvorak.inc
+++ b/packages/opie-dvorak/opie-dvorak.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Dvorak keyboard input method"
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-pickboard"
 RDEPENDS = "opie-pickboard"
diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole.inc b/packages/opie-embeddedkonsole/opie-embeddedkonsole.inc
index def90b59b2..d878dfe97a 100644
--- a/packages/opie-embeddedkonsole/opie-embeddedkonsole.inc
+++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie embedded konsole"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libqtaux2 opie-keytabs"
 RDEPENDS = "opie-keytabs"
diff --git a/packages/opie-euroconv/opie-euroconv.inc b/packages/opie-euroconv/opie-euroconv.inc
index 0911381e9d..58b0f5fab3 100644
--- a/packages/opie-euroconv/opie-euroconv.inc
+++ b/packages/opie-euroconv/opie-euroconv.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Euroconv"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "euroconv"
 
diff --git a/packages/opie-examples-python/opie-examples-python.inc b/packages/opie-examples-python/opie-examples-python.inc
index 060f8b12c8..10ba40afdf 100644
--- a/packages/opie-examples-python/opie-examples-python.inc
+++ b/packages/opie-examples-python/opie-examples-python.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python examples for Opie"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "python-pyqt opie-pyquicklaunchapplet"
 APPNAME = "python"
diff --git a/packages/opie-examples/opie-examples.inc b/packages/opie-examples/opie-examples.inc
index 2bf8ebfd35..d90c3e1b81 100644
--- a/packages/opie-examples/opie-examples.inc
+++ b/packages/opie-examples/opie-examples.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Developer Examples for Opie"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 DEPENDS = "opie-networksettings"
 LICENSE = "GPL"
 APPTYPE = "binary"
diff --git a/packages/opie-eye/opie-eye.inc b/packages/opie-eye/opie-eye.inc
index d78acfc167..dc89d72ab4 100644
--- a/packages/opie-eye/opie-eye.inc
+++ b/packages/opie-eye/opie-eye.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "A image viewer"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libopiecore2 libopieui2 libopiemm2"
 RDEPENDS = "opie-advancedfm-pics"
diff --git a/packages/opie-fifteen/opie-fifteen.inc b/packages/opie-fifteen/opie-fifteen.inc
index e5c7c519e7..a3951755d2 100644
--- a/packages/opie-fifteen/opie-fifteen.inc
+++ b/packages/opie-fifteen/opie-fifteen.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Fifteen pieces game"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "fifteen"
 
diff --git a/packages/opie-formatter/opie-formatter.inc b/packages/opie-formatter/opie-formatter.inc
index c8b1dc13c7..f259d0a76a 100644
--- a/packages/opie-formatter/opie-formatter.inc
+++ b/packages/opie-formatter/opie-formatter.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "The filesystem formatting and mountpoint app for the Opie environment."
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "formatter"
 
diff --git a/packages/opie-freetype/opie-freetype.inc b/packages/opie-freetype/opie-freetype.inc
index c7cd9428ac..2a8a833e2b 100644
--- a/packages/opie-freetype/opie-freetype.inc
+++ b/packages/opie-freetype/opie-freetype.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Freetype fontfactory plugin"
 SECTION = "opie/fontfactories"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "freetype opie-ttf-support"
 RDEPENDS = "opie-ttf-support"
diff --git a/packages/opie-ftp/opie-ftp.inc b/packages/opie-ftp/opie-ftp.inc
index 7099ed54a1..1e7d7120eb 100644
--- a/packages/opie-ftp/opie-ftp.inc
+++ b/packages/opie-ftp/opie-ftp.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie-Ftp"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libopiecore2 opie-ftplib"
 APPNAME = "opieftp"
diff --git a/packages/opie-ftplib/opie-ftplib.inc b/packages/opie-ftplib/opie-ftplib.inc
index b95d1aab6a..1d633ca3dd 100644
--- a/packages/opie-ftplib/opie-ftplib.inc
+++ b/packages/opie-ftplib/opie-ftplib.inc
@@ -1,6 +1,5 @@
 DESCRIPTION = "Opie FTP Library"
 SECTION = "opie/libs"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 PRIORITY = "optional"
 LICENSE = "GPL"
 PROVIDES = "libftplib1"
diff --git a/packages/opie-go/opie-go.inc b/packages/opie-go/opie-go.inc
index ba5ff25029..43f566aa65 100644
--- a/packages/opie-go/opie-go.inc
+++ b/packages/opie-go/opie-go.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "The game of Go"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "go"
 
diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser.inc b/packages/opie-gutenbrowser/opie-gutenbrowser.inc
index fbbc56b650..f1bd5f7e20 100644
--- a/packages/opie-gutenbrowser/opie-gutenbrowser.inc
+++ b/packages/opie-gutenbrowser/opie-gutenbrowser.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Etext reader for the Project Gutenberg."
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-ftplib"
 APPNAME = "gutenbrowser"
diff --git a/packages/opie-handwriting/opie-handwriting.inc b/packages/opie-handwriting/opie-handwriting.inc
index 6687af0e26..caecc65d58 100644
--- a/packages/opie-handwriting/opie-handwriting.inc
+++ b/packages/opie-handwriting/opie-handwriting.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Handwriting input method"
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "qhandwriting"
 
diff --git a/packages/opie-help-en/opie-help-en.inc b/packages/opie-help-en/opie-help-en.inc
index 7c7bfcc194..1f06277069 100644
--- a/packages/opie-help-en/opie-help-en.inc
+++ b/packages/opie-help-en/opie-help-en.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Help Packages - English"
 SECTION = "opie/help"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 ALLOW_EMPTY = 1
 PACKAGE_ARCH = "all"
diff --git a/packages/opie-helpbrowser/opie-helpbrowser.inc b/packages/opie-helpbrowser/opie-helpbrowser.inc
index 325d964f0e..cd3354cea0 100644
--- a/packages/opie-helpbrowser/opie-helpbrowser.inc
+++ b/packages/opie-helpbrowser/opie-helpbrowser.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Help Browser"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "helpbrowser"
 
diff --git a/packages/opie-homeapplet/opie-homeapplet.inc b/packages/opie-homeapplet/opie-homeapplet.inc
index 82289e1524..4e98952789 100644
--- a/packages/opie-homeapplet/opie-homeapplet.inc
+++ b/packages/opie-homeapplet/opie-homeapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Home Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "homeapplet"
 
diff --git a/packages/opie-i18n/opie-i18n.inc b/packages/opie-i18n/opie-i18n.inc
index e36da0baa3..da5b5866ad 100644
--- a/packages/opie-i18n/opie-i18n.inc
+++ b/packages/opie-i18n/opie-i18n.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie i18n files"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-lrelease-native"
 
diff --git a/packages/opie-i18n/opie-lrelease-native.inc b/packages/opie-i18n/opie-lrelease-native.inc
index 16d983693b..f536704328 100644
--- a/packages/opie-i18n/opie-lrelease-native.inc
+++ b/packages/opie-i18n/opie-lrelease-native.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie native i18n tool lrelease"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "uicmoc3-native"
 
diff --git a/packages/opie-i18n/opie-lupdate-native.inc b/packages/opie-i18n/opie-lupdate-native.inc
index 98eb30a864..2670e41548 100644
--- a/packages/opie-i18n/opie-lupdate-native.inc
+++ b/packages/opie-i18n/opie-lupdate-native.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie native i18n tool lupdate"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "uicmoc3-native"
 
diff --git a/packages/opie-icon-reload/opie-icon-reload.inc b/packages/opie-icon-reload/opie-icon-reload.inc
index da90412c1f..894577b1a4 100644
--- a/packages/opie-icon-reload/opie-icon-reload.inc
+++ b/packages/opie-icon-reload/opie-icon-reload.inc
@@ -1,7 +1,6 @@
 SECTION = "opie/settings"
 DESCRIPTION = "Reload .desktop files on the fly"
 PRIORITY = "optional"
-MAINTAINER = "Matthias 'CoreDump' Hentges <coredump@handhelds.org>"
 LICENSE = "GPL"
 
 SRC_URI = "file://icon-reload.desktop \
diff --git a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
index 9569084eb1..a398b21c44 100644
--- a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
@@ -1,7 +1,6 @@
 SECTION = "opie/settings"
 DESCRIPTION = "Reload .desktop files on the fly"
 PRIORITY = "optional"
-MAINTAINER = "Matthias 'CoreDump' Hentges <coredump@handhelds.org>"
 LICENSE = "GPL"
 
 PR = "r3"
diff --git a/packages/opie-irc/opie-irc.inc b/packages/opie-irc/opie-irc.inc
index 1c7ebf0675..269d9c9b2a 100644
--- a/packages/opie-irc/opie-irc.inc
+++ b/packages/opie-irc/opie-irc.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "The Opie IRC client lets you chat on your favorite IRC server using your handheld computer"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 I18N_FILES = "opieirc.ts"
 DEPENDS = "libqtaux2"
diff --git a/packages/opie-irdaapplet/opie-irdaapplet.inc b/packages/opie-irdaapplet/opie-irdaapplet.inc
index 56620416fb..d9f15453a5 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet.inc
+++ b/packages/opie-irdaapplet/opie-irdaapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "IrDA Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "irdaapplet"
 
diff --git a/packages/opie-jumpx/opie-jumpx.inc b/packages/opie-jumpx/opie-jumpx.inc
index e857bfd58b..8448e9a03c 100644
--- a/packages/opie-jumpx/opie-jumpx.inc
+++ b/packages/opie-jumpx/opie-jumpx.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "JumpX input method"
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "qjumpx"
 
diff --git a/packages/opie-kbill/opie-kbill.inc b/packages/opie-kbill/opie-kbill.inc
index d05212d511..c81d305222 100644
--- a/packages/opie-kbill/opie-kbill.inc
+++ b/packages/opie-kbill/opie-kbill.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "The famous hit Bill game"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "kbill"
 APPTYPE = "binary"
diff --git a/packages/opie-kcheckers/opie-kcheckers.inc b/packages/opie-kcheckers/opie-kcheckers.inc
index acf9709d2a..5071ac5e6a 100644
--- a/packages/opie-kcheckers/opie-kcheckers.inc
+++ b/packages/opie-kcheckers/opie-kcheckers.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "The game of Checkers"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "kcheckers"
 
diff --git a/packages/opie-keyboard/opie-keyboard.inc b/packages/opie-keyboard/opie-keyboard.inc
index 5cc48b3270..d99b02ab80 100644
--- a/packages/opie-keyboard/opie-keyboard.inc
+++ b/packages/opie-keyboard/opie-keyboard.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Keyboard input method"
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-pickboard"
 RDEPENDS = "opie-pickboard"
diff --git a/packages/opie-keypebble/opie-keypebble.inc b/packages/opie-keypebble/opie-keypebble.inc
index 042d2645e4..fcc8eee4a9 100644
--- a/packages/opie-keypebble/opie-keypebble.inc
+++ b/packages/opie-keypebble/opie-keypebble.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "A VNC Viewer"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "keypebble"
 
diff --git a/packages/opie-keytabs/opie-keytabs.inc b/packages/opie-keytabs/opie-keytabs.inc
index 1f8248b36d..6a231c1b7b 100644
--- a/packages/opie-keytabs/opie-keytabs.inc
+++ b/packages/opie-keytabs/opie-keytabs.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "Opie keytabs for terminal applications"
 SECTION = "opie/base"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie-devel@handhelds.org>"
 
 do_install() {
         install -d ${D}${palmtopdir}/etc/keytabs/
diff --git a/packages/opie-kjumpx/opie-kjumpx.inc b/packages/opie-kjumpx/opie-kjumpx.inc
index 2d4a886013..631f2353b6 100644
--- a/packages/opie-kjumpx/opie-kjumpx.inc
+++ b/packages/opie-kjumpx/opie-kjumpx.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Koreanized JumpX input method"
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-pics"
 APPNAME = "qkjumpx"
diff --git a/packages/opie-kpacman/opie-kpacman.inc b/packages/opie-kpacman/opie-kpacman.inc
index 2f004e83bb..7ee37ffb17 100644
--- a/packages/opie-kpacman/opie-kpacman.inc
+++ b/packages/opie-kpacman/opie-kpacman.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Kpacman, the classical arcade game of Pacman"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "kpacman"
 
diff --git a/packages/opie-language/opie-language.inc b/packages/opie-language/opie-language.inc
index 561604240e..117ea384fd 100644
--- a/packages/opie-language/opie-language.inc
+++ b/packages/opie-language/opie-language.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Language settings dialog"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "language"
 
diff --git a/packages/opie-launcher-settings/opie-launcher-settings.inc b/packages/opie-launcher-settings/opie-launcher-settings.inc
index f46d3e8a4b..e5b4263860 100644
--- a/packages/opie-launcher-settings/opie-launcher-settings.inc
+++ b/packages/opie-launcher-settings/opie-launcher-settings.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Launcher settings dialog"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libqtaux2"
 APPNAME = "launchersettings"
diff --git a/packages/opie-libqrsync/opie-libqrsync.inc b/packages/opie-libqrsync/opie-libqrsync.inc
index 932971abe8..8d0c86c1b1 100644
--- a/packages/opie-libqrsync/opie-libqrsync.inc
+++ b/packages/opie-libqrsync/opie-libqrsync.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Qt wrapper for librsync"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 
 S = "${WORKDIR}/rsync"
diff --git a/packages/opie-light-and-power/opie-light-and-power.inc b/packages/opie-light-and-power/opie-light-and-power.inc
index d43d84a695..0d68d5fb6e 100644
--- a/packages/opie-light-and-power/opie-light-and-power.inc
+++ b/packages/opie-light-and-power/opie-light-and-power.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Light and Power settings dialog"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "light-and-power"
 
diff --git a/packages/opie-lockapplet/opie-lockapplet.inc b/packages/opie-lockapplet/opie-lockapplet.inc
index d54c854236..b09673047e 100644
--- a/packages/opie-lockapplet/opie-lockapplet.inc
+++ b/packages/opie-lockapplet/opie-lockapplet.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "Lock Opie now Button to lock Opie (as configured in the Security
 SECTION = "opie/applets"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 APPNAME = "lockapplet"
 DEPENDS = "opie-security"
 RDEPENDS = "opie-security"
diff --git a/packages/opie-login/opie-login.inc b/packages/opie-login/opie-login.inc
index 1dc7ed9289..c65348bee3 100644
--- a/packages/opie-login/opie-login.inc
+++ b/packages/opie-login/opie-login.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Login Manager (similar to gdm, xdm or kdm)"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RRECOMMENDS = "opie-logoutapplet"
 APPNAME = "opie-login"
diff --git a/packages/opie-logoutapplet/opie-logoutapplet.inc b/packages/opie-logoutapplet/opie-logoutapplet.inc
index 120ec4cbb1..edf8b992fe 100644
--- a/packages/opie-logoutapplet/opie-logoutapplet.inc
+++ b/packages/opie-logoutapplet/opie-logoutapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Logout Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "logoutapplet"
 
diff --git a/packages/opie-mail/opie-mail.inc b/packages/opie-mail/opie-mail.inc
index c8af678294..40e2b8a4ef 100644
--- a/packages/opie-mail/opie-mail.inc
+++ b/packages/opie-mail/opie-mail.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie's mail and news client featuring POP3, IMAP and NNTP - with and without SSL."
 SECTION = "opie/pim"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libmailwrapper libetpan"
 RDEPENDS = "opie-pics"
diff --git a/packages/opie-mailapplet/opie-mailapplet.inc b/packages/opie-mailapplet/opie-mailapplet.inc
index b15a982c99..751304600b 100644
--- a/packages/opie-mailapplet/opie-mailapplet.inc
+++ b/packages/opie-mailapplet/opie-mailapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Biff-like mailchecker"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libmailwrapper"
 APPNAME = "mailapplet"
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc
index cb893ed772..14aec8d351 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "MP3 file plugin for opie-mediaplayer11 using libmad"
 SECTION = "opie/codecs"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-mediaplayer1 libmad"
 RDEPENDS = "opie-mediaplayer1"
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc
index 97e8dca7fa..b5949be74d 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Ogg file plugin using tremor"
 SECTION = "opie/codecs"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-mediaplayer1 tremor"
 RDEPENDS = "opie-mediaplayer1"
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
index 0735bf5931..1a1c43344f 100644
--- a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "OPIE Mediaplayer1 OGG+MP3 pseudo package."
-MAINTAINER = "Werner Schulte <w1@schulte-ac.de>"
 LICENSE = "GPL"
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb
index 7707e9671a..0c6b505d8c 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 APPNAME = "opieplayer2"
 RPROVIDES="opie-mediaplayer2-skin"
 
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
index 81d4c9d7a9..3cb7f8551e 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 # Remove the dash below when 1.2.1 changes in PV
 PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb
index 43fe357625..e0b8efe4dc 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 APPNAME = "opieplayer2"
 RPROVIDES = "opie-mediaplayer2-skin"
 
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
index 60990e99f1..b2e826ae59 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 # Remove the dash below when 1.2.1 changes in PV
 PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb
index f40e4ea658..a40604c041 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 APPNAME = "opieplayer2"
 RPROVIDES = "opie-mediaplayer2-skin"
 
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
index 170c26c42a..d091f50903 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 # Remove the dash below when 1.2.1 changes in PV
 PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb
index bcff4f1702..7a6715e5cf 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 APPNAME = "opieplayer2"
 RPROVIDES = "opie-mediaplayer2-skin"
 
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
index 27f4745d57..ca44bfc3af 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 # Remove the dash below when 1.2.1 changes in PV
 PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2.inc b/packages/opie-mediaplayer2/opie-mediaplayer2.inc
index fed919a9c0..b4fb39bbe7 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2.inc
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2.inc
@@ -3,7 +3,6 @@ It plays mp3, mpeg, wav, ogg, quicktime, divx, etc. and is capable of streaming.
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 DEPENDS = "libxine-fb libqtaux2 opie-mediaplayer2-skin-default"
 RDEPENDS = "opie-mediaplayer2-skin-default"
 RRECOMMENDS = "libxine-plugin-ao-out-oss libxine-plugin-inp-file \
diff --git a/packages/opie-mediummount/opie-mediummount.inc b/packages/opie-mediummount/opie-mediummount.inc
index eeb8b77ea4..05dff9287a 100644
--- a/packages/opie-mediummount/opie-mediummount.inc
+++ b/packages/opie-mediummount/opie-mediummount.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Medium mount configuration"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "mediummount"
 
diff --git a/packages/opie-mindbreaker/opie-mindbreaker.inc b/packages/opie-mindbreaker/opie-mindbreaker.inc
index 26d2c6c745..be08ba8b8e 100644
--- a/packages/opie-mindbreaker/opie-mindbreaker.inc
+++ b/packages/opie-mindbreaker/opie-mindbreaker.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Game: crack the coloured code"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "mindbreaker"
 
diff --git a/packages/opie-minesweep/opie-minesweep.inc b/packages/opie-minesweep/opie-minesweep.inc
index 8d393327ca..05369ae536 100644
--- a/packages/opie-minesweep/opie-minesweep.inc
+++ b/packages/opie-minesweep/opie-minesweep.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Game: find the mines"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "minesweep"
 
diff --git a/packages/opie-multikey/opie-multikey.inc b/packages/opie-multikey/opie-multikey.inc
index 8b05b486c6..40cc884715 100644
--- a/packages/opie-multikey/opie-multikey.inc
+++ b/packages/opie-multikey/opie-multikey.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Multiple language keyboard"
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libqtaux2 opie-pickboard"
 RDEPENDS = "opie-pics opie-pickboard"
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet.inc b/packages/opie-multikeyapplet/opie-multikeyapplet.inc
index 5f32d6595c..6e40790f07 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet.inc
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Multikey Keyboard Layout Switcher Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "multikeyapplet"
 
diff --git a/packages/opie-networkapplet/opie-networkapplet.inc b/packages/opie-networkapplet/opie-networkapplet.inc
index 096a3ce9d4..f67861e069 100644
--- a/packages/opie-networkapplet/opie-networkapplet.inc
+++ b/packages/opie-networkapplet/opie-networkapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Network Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-networksettings"
 APPNAME = "networkapplet"
diff --git a/packages/opie-networksettings/opie-networksettings.inc b/packages/opie-networksettings/opie-networksettings.inc
index c2f59fd04d..6eeb217309 100644
--- a/packages/opie-networksettings/opie-networksettings.inc
+++ b/packages/opie-networksettings/opie-networksettings.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Network Settings"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
 APPNAME = "networksettings"
diff --git a/packages/opie-notes/opie-notes.inc b/packages/opie-notes/opie-notes.inc
index b379a41286..413a992df3 100644
--- a/packages/opie-notes/opie-notes.inc
+++ b/packages/opie-notes/opie-notes.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Notes"
 SECTION = "opie/pim"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 APPNAME = "opie-notes"
 APPTYPE = "binary"
diff --git a/packages/opie-notesapplet/opie-notesapplet.inc b/packages/opie-notesapplet/opie-notesapplet.inc
index 97bee71446..9c167fd4cd 100644
--- a/packages/opie-notesapplet/opie-notesapplet.inc
+++ b/packages/opie-notesapplet/opie-notesapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Notes Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "notesapplet"
 
diff --git a/packages/opie-odict/opie-odict.inc b/packages/opie-odict/opie-odict.inc
index 03ec35aa83..9334148a6f 100644
--- a/packages/opie-odict/opie-odict.inc
+++ b/packages/opie-odict/opie-odict.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Dictionary look-up program"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "odict"
 
diff --git a/packages/opie-oxygen/opie-oxygen.inc b/packages/opie-oxygen/opie-oxygen.inc
index 3e323f9463..095f71518b 100644
--- a/packages/opie-oxygen/opie-oxygen.inc
+++ b/packages/opie-oxygen/opie-oxygen.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Oxygen"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "oxygen"
 
diff --git a/packages/opie-oxygen/opie-oxygen_1.0.0.bb b/packages/opie-oxygen/opie-oxygen_1.0.0.bb
index 99beb12f10..767295618e 100644
--- a/packages/opie-oxygen/opie-oxygen_1.0.0.bb
+++ b/packages/opie-oxygen/opie-oxygen_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Oxygen"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "oxygen"
 PR = "r0"
diff --git a/packages/opie-oyatzee/opie-oyatzee.inc b/packages/opie-oyatzee/opie-oyatzee.inc
index 6ffa99b89e..fdadc70642 100644
--- a/packages/opie-oyatzee/opie-oyatzee.inc
+++ b/packages/opie-oyatzee/opie-oyatzee.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Yatzee-like game"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "oyatzee"
 
diff --git a/packages/opie-packagemanager/opie-packagemanager.inc b/packages/opie-packagemanager/opie-packagemanager.inc
index 0ec6b93fbf..39a5b3ad81 100644
--- a/packages/opie-packagemanager/opie-packagemanager.inc
+++ b/packages/opie-packagemanager/opie-packagemanager.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Package Manager"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libipkg"
 APPNAME = "packagemanager"
diff --git a/packages/opie-parashoot/opie-parashoot.inc b/packages/opie-parashoot/opie-parashoot.inc
index 2a7300c21c..ec10d07c80 100644
--- a/packages/opie-parashoot/opie-parashoot.inc
+++ b/packages/opie-parashoot/opie-parashoot.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Game: shoot the parachutists"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "parashoot"
 
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc b/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
index 82ed61a001..11b93eed0f 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "PCMCIA/CF Manager Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "pcmciaapplet"
 
diff --git a/packages/opie-pickboard/opie-pickboard.inc b/packages/opie-pickboard/opie-pickboard.inc
index 16d123af60..37866ceef1 100644
--- a/packages/opie-pickboard/opie-pickboard.inc
+++ b/packages/opie-pickboard/opie-pickboard.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Pickboard input method"
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "qpickboard"
 
diff --git a/packages/opie-pics/opie-pics.inc b/packages/opie-pics/opie-pics.inc
index fb0898297e..26c0bd04c7 100644
--- a/packages/opie-pics/opie-pics.inc
+++ b/packages/opie-pics/opie-pics.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Common Opie pictures usable from all applications"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 
 S = "${WORKDIR}"
diff --git a/packages/opie-pimconverter/opie-pimconverter.inc b/packages/opie-pimconverter/opie-pimconverter.inc
index 4ed8d0a6b5..4c50ce4157 100644
--- a/packages/opie-pimconverter/opie-pimconverter.inc
+++ b/packages/opie-pimconverter/opie-pimconverter.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie PIM database converter"
 SECTION = "opie/pim"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "sqlite3 sqlite" 
 RDEPENDS = "sqlite3 sqlite-bin" 
diff --git a/packages/opie-powerchord/opie-powerchord.inc b/packages/opie-powerchord/opie-powerchord.inc
index b063eb2d49..82837f88c9 100644
--- a/packages/opie-powerchord/opie-powerchord.inc
+++ b/packages/opie-powerchord/opie-powerchord.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Guitar Chord generator application"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "powerchord"
 
diff --git a/packages/opie-qasteroids/opie-qasteroids.inc b/packages/opie-qasteroids/opie-qasteroids.inc
index 708625685d..eea8d44297 100644
--- a/packages/opie-qasteroids/opie-qasteroids.inc
+++ b/packages/opie-qasteroids/opie-qasteroids.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Game: shoot the asteroids"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "qasteroids"
 
diff --git a/packages/opie-qcop/opie-qcop.inc b/packages/opie-qcop/opie-qcop.inc
index dd12d51636..8c3632877d 100644
--- a/packages/opie-qcop/opie-qcop.inc
+++ b/packages/opie-qcop/opie-qcop.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie QCOP IPC Client"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 
 S = "${WORKDIR}/qcop"
diff --git a/packages/opie-qss/opie-qss.inc b/packages/opie-qss/opie-qss.inc
index 66388790cd..10abdf20ea 100644
--- a/packages/opie-qss/opie-qss.inc
+++ b/packages/opie-qss/opie-qss.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Sound Sever Daemon"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 
 S = "${WORKDIR}/qss"
diff --git a/packages/opie-quicklauncher/opie-quicklauncher.inc b/packages/opie-quicklauncher/opie-quicklauncher.inc
index 7a2f8964b2..d445f6993d 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher.inc
+++ b/packages/opie-quicklauncher/opie-quicklauncher.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "The Opie Quick Launcher Loader"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 
 S = "${WORKDIR}/quicklauncher"
diff --git a/packages/opie-rdesktop/opie-rdesktop.inc b/packages/opie-rdesktop/opie-rdesktop.inc
index 1924f9c7d6..547907ab5a 100644
--- a/packages/opie-rdesktop/opie-rdesktop.inc
+++ b/packages/opie-rdesktop/opie-rdesktop.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Remote Desktop Protocol (RDP) Client"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "openssl"
 I18N_FILES = "ordesktop.ts"
diff --git a/packages/opie-reader/opie-reader.inc b/packages/opie-reader/opie-reader.inc
index 42c097ba17..1d8301ed03 100644
--- a/packages/opie-reader/opie-reader.inc
+++ b/packages/opie-reader/opie-reader.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "E-Book reader"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "opie-reader"
 APPTYPE = "binary"
diff --git a/packages/opie-recorder/opie-recorder.inc b/packages/opie-recorder/opie-recorder.inc
index aa416dccfd..1c2d7222e0 100644
--- a/packages/opie-recorder/opie-recorder.inc
+++ b/packages/opie-recorder/opie-recorder.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Audio sampling recorder"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "opierec"
 
diff --git a/packages/opie-remote/opie-remote.inc b/packages/opie-remote/opie-remote.inc
index da6b4b887d..e7fc7667c5 100644
--- a/packages/opie-remote/opie-remote.inc
+++ b/packages/opie-remote/opie-remote.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "A remote control"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "lirc"
 APPNAME = "remote"
diff --git a/packages/opie-restartapplet/opie-restartapplet.inc b/packages/opie-restartapplet/opie-restartapplet.inc
index dc5a92b137..86c1f4c2ed 100644
--- a/packages/opie-restartapplet/opie-restartapplet.inc
+++ b/packages/opie-restartapplet/opie-restartapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Restart Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "restartapplet"
 
diff --git a/packages/opie-restartapplet/opie-restartapplet2_1.2.2.bb b/packages/opie-restartapplet/opie-restartapplet2_1.2.2.bb
index d38fcba863..4d64ab0ec8 100644
--- a/packages/opie-restartapplet/opie-restartapplet2_1.2.2.bb
+++ b/packages/opie-restartapplet/opie-restartapplet2_1.2.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Restart Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 
 APPNAME = "restartapplet"
diff --git a/packages/opie-restartapplet/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet/opie-restartapplet2_cvs.bb
index 62461b6a22..b1793cefec 100644
--- a/packages/opie-restartapplet/opie-restartapplet2_cvs.bb
+++ b/packages/opie-restartapplet/opie-restartapplet2_cvs.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Restart Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "${OPIE_CVS_PV}"
 APPNAME = "restartapplet"
diff --git a/packages/opie-restartapplet2/opie-restartapplet2.inc b/packages/opie-restartapplet2/opie-restartapplet2.inc
index 4c65f24323..9fa011fcca 100644
--- a/packages/opie-restartapplet2/opie-restartapplet2.inc
+++ b/packages/opie-restartapplet2/opie-restartapplet2.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Restart Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "restartapplet2"
 I18N_FILES = "librestartapplet2.ts"
diff --git a/packages/opie-rotateapplet/opie-rotateapplet.inc b/packages/opie-rotateapplet/opie-rotateapplet.inc
index 01d2164760..ae8408379e 100644
--- a/packages/opie-rotateapplet/opie-rotateapplet.inc
+++ b/packages/opie-rotateapplet/opie-rotateapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Rotate Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "rotateapplet"
 
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet.inc b/packages/opie-screenshotapplet/opie-screenshotapplet.inc
index 1ff889ab20..a8872609f5 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet.inc
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Screenshot Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "screenshotapplet"
 
diff --git a/packages/opie-search/opie-search.inc b/packages/opie-search/opie-search.inc
index 312d4cbc98..ad35da8cf8 100644
--- a/packages/opie-search/opie-search.inc
+++ b/packages/opie-search/opie-search.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Search through all PIM data"
 SECTION = "opie/pim"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "osearch"
 
diff --git a/packages/opie-security/opie-security.inc b/packages/opie-security/opie-security.inc
index d207399fee..b9fbbbdd0a 100644
--- a/packages/opie-security/opie-security.inc
+++ b/packages/opie-security/opie-security.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Security settings dialog for the Opie environment."
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "security"
 
diff --git a/packages/opie-securityplugins/opie-securityplugin.inc b/packages/opie-securityplugins/opie-securityplugin.inc
index 855a610f6d..f21cfdbb76 100644
--- a/packages/opie-securityplugins/opie-securityplugin.inc
+++ b/packages/opie-securityplugins/opie-securityplugin.inc
@@ -1,6 +1,5 @@
 SECTION = "opie/security"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-security"
 I18N_FILES = "lib${APPNAME}.ts"
diff --git a/packages/opie-sfcave/opie-sfcave.inc b/packages/opie-sfcave/opie-sfcave.inc
index f7abc17955..bb39fa7762 100644
--- a/packages/opie-sfcave/opie-sfcave.inc
+++ b/packages/opie-sfcave/opie-sfcave.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "SFCave for the Zaurus. Fly the dot though the cave avoiding the walls."
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "sfcave"
 
diff --git a/packages/opie-sh-snes/opie-sh-snes.inc b/packages/opie-sh-snes/opie-sh-snes.inc
index a90a884c93..14c1dcd242 100644
--- a/packages/opie-sh-snes/opie-sh-snes.inc
+++ b/packages/opie-sh-snes/opie-sh-snes.inc
@@ -1,4 +1,3 @@
-MAINTAINER = "Matthias 'CoreDump' Hentges <coredump@handhelds.org>"
 DESCRIPTION = "Displays a list of available ROMs for use with snes9x."
 SECTION = "opie/shell"
 PRIORITY = "optional"
diff --git a/packages/opie-sh-snes/opie-sh-snes_0.2.bb b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
index a49a025fc0..289a1cd01e 100644
--- a/packages/opie-sh-snes/opie-sh-snes_0.2.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Matthias 'CoreDump' Hentges <coredump@handhelds.org>"
 DESCRIPTION = "Displays a list of available ROMs for use with snes9x."
 SECTION = "opie/shell"
 PRIORITY = "optional"
diff --git a/packages/opie-sh/opie-sh.inc b/packages/opie-sh/opie-sh.inc
index bac34ce714..7fe8e79df9 100644
--- a/packages/opie-sh/opie-sh.inc
+++ b/packages/opie-sh/opie-sh.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "A QDialog shell frontend"
 SECTION = "opie/Shell"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "opie-sh"
 APPTYPE = "binary"
diff --git a/packages/opie-sheet/opie-sheet.inc b/packages/opie-sheet/opie-sheet.inc
index a19a68847d..d7ff7d3fb9 100644
--- a/packages/opie-sheet/opie-sheet.inc
+++ b/packages/opie-sheet/opie-sheet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Sheet"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "opie-sheet"
 
diff --git a/packages/opie-snake/opie-snake.inc b/packages/opie-snake/opie-snake.inc
index 62e5ef8fbe..cd980a0314 100644
--- a/packages/opie-snake/opie-snake.inc
+++ b/packages/opie-snake/opie-snake.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Game: control the snake"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "snake"
 
diff --git a/packages/opie-solitaire/opie-solitaire.inc b/packages/opie-solitaire/opie-solitaire.inc
index 6003711b8b..fa340b3ef1 100644
--- a/packages/opie-solitaire/opie-solitaire.inc
+++ b/packages/opie-solitaire/opie-solitaire.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Game: solitaire card games"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "patience"
 
diff --git a/packages/opie-sounds/opie-sounds.inc b/packages/opie-sounds/opie-sounds.inc
index d19272ac6e..aa39e6e5d7 100644
--- a/packages/opie-sounds/opie-sounds.inc
+++ b/packages/opie-sounds/opie-sounds.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Common Opie Sounds"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 
 S = "${WORKDIR}/sounds"
diff --git a/packages/opie-sshkeys/opie-sshkeys.inc b/packages/opie-sshkeys/opie-sshkeys.inc
index 10ca8b1626..cf160f3500 100644
--- a/packages/opie-sshkeys/opie-sshkeys.inc
+++ b/packages/opie-sshkeys/opie-sshkeys.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Utility for managing ssh-agent keys"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "ssh opie-sh-ssh-askpass"
 APPNAME = "sshkeys"
diff --git a/packages/opie-stumbler/opie-stumbler.inc b/packages/opie-stumbler/opie-stumbler.inc
index 4174b6f7e5..4c16fa86fb 100644
--- a/packages/opie-stumbler/opie-stumbler.inc
+++ b/packages/opie-stumbler/opie-stumbler.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "A Wireless Network Scanner"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 RRECOMMENDS = "manufacturers"
 APPNAME = "opiestumbler"
 
diff --git a/packages/opie-style-flat/opie-style-flat.inc b/packages/opie-style-flat/opie-style-flat.inc
index 7da79180e6..f94573b03f 100644
--- a/packages/opie-style-flat/opie-style-flat.inc
+++ b/packages/opie-style-flat/opie-style-flat.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Simple, flat widget style for Opie"
 SECTION = "opie/styles"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "flatstyle"
 
diff --git a/packages/opie-style-fresh/opie-style-fresh.inc b/packages/opie-style-fresh/opie-style-fresh.inc
index 5c1f186b08..386c5ac620 100644
--- a/packages/opie-style-fresh/opie-style-fresh.inc
+++ b/packages/opie-style-fresh/opie-style-fresh.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie widget style"
 SECTION = "opie/styles"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "freshstyle"
 
diff --git a/packages/opie-style-liquid/opie-style-liquid.inc b/packages/opie-style-liquid/opie-style-liquid.inc
index 29219bfb20..364b61f23b 100644
--- a/packages/opie-style-liquid/opie-style-liquid.inc
+++ b/packages/opie-style-liquid/opie-style-liquid.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Liquid style by Mosfet"
 SECTION = "opie/styles"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = " libqtaux2"
 APPNAME = "liquid"
diff --git a/packages/opie-style-metal/opie-style-metal.inc b/packages/opie-style-metal/opie-style-metal.inc
index dd7cc47fbc..cef2f2a541 100644
--- a/packages/opie-style-metal/opie-style-metal.inc
+++ b/packages/opie-style-metal/opie-style-metal.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Metal Style by Trolltech"
 SECTION = "opie/styles"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "metal"
 
diff --git a/packages/opie-suspendapplet/opie-suspendapplet.inc b/packages/opie-suspendapplet/opie-suspendapplet.inc
index 4a99f283dd..cd0d917ec0 100644
--- a/packages/opie-suspendapplet/opie-suspendapplet.inc
+++ b/packages/opie-suspendapplet/opie-suspendapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Suspend Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "suspendapplet"
 
diff --git a/packages/opie-symlinker/opie-symlinker.inc b/packages/opie-symlinker/opie-symlinker.inc
index 2ac256e842..713ead3e89 100644
--- a/packages/opie-symlinker/opie-symlinker.inc
+++ b/packages/opie-symlinker/opie-symlinker.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Enables apps on external media"
 SECTION = "opie/base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "opie-update-symlinks"
 APPTYPE = "binary"
diff --git a/packages/opie-sysinfo/opie-sysinfo.inc b/packages/opie-sysinfo/opie-sysinfo.inc
index 41172f95e9..0b03db77d3 100644
--- a/packages/opie-sysinfo/opie-sysinfo.inc
+++ b/packages/opie-sysinfo/opie-sysinfo.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "System Information dialog for the Opie environment"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "sysinfo"
 
diff --git a/packages/opie-systemtime/opie-systemtime.inc b/packages/opie-systemtime/opie-systemtime.inc
index 23a3b07db8..724e38e432 100644
--- a/packages/opie-systemtime/opie-systemtime.inc
+++ b/packages/opie-systemtime/opie-systemtime.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Set the system time - utilizing ntpdate, if available."
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RRECOMMENDS = "ntpdate"
 
diff --git a/packages/opie-tableviewer/opie-tableviewer.inc b/packages/opie-tableviewer/opie-tableviewer.inc
index 734e12d9fc..86a9f3f960 100644
--- a/packages/opie-tableviewer/opie-tableviewer.inc
+++ b/packages/opie-tableviewer/opie-tableviewer.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "XML database browsers"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "tableviewer"
 
diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc
index fd218d2a02..edc2c7a479 100644
--- a/packages/opie-taskbar/opie-taskbar.inc
+++ b/packages/opie-taskbar/opie-taskbar.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "Opie Launcher and Taskbar"
 SECTION = "opie/base"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 DEPENDS = "opie-libqrsync opie-qss"
 APPNAME = "qpe"
 
diff --git a/packages/opie-tetrix/opie-tetrix.inc b/packages/opie-tetrix/opie-tetrix.inc
index 0c27745ada..12d7f6f7aa 100644
--- a/packages/opie-tetrix/opie-tetrix.inc
+++ b/packages/opie-tetrix/opie-tetrix.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Game: control falling blocks"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "tetrix"
 
diff --git a/packages/opie-textedit/opie-textedit.inc b/packages/opie-textedit/opie-textedit.inc
index 39bf4d135d..1cc78ec1bf 100644
--- a/packages/opie-textedit/opie-textedit.inc
+++ b/packages/opie-textedit/opie-textedit.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Text Editor"
 SECTION = "opie/pim"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "textedit"
 
diff --git a/packages/opie-theme/opie-theme.inc b/packages/opie-theme/opie-theme.inc
index 7614953d21..efb72b3d55 100644
--- a/packages/opie-theme/opie-theme.inc
+++ b/packages/opie-theme/opie-theme.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Themed style"
 SECTION = "opie/styles"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "theme"
 
diff --git a/packages/opie-tictac/opie-tictac.inc b/packages/opie-tictac/opie-tictac.inc
index fcac9a59b4..1b0f7c9f46 100644
--- a/packages/opie-tictac/opie-tictac.inc
+++ b/packages/opie-tictac/opie-tictac.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Tic Tac Toe game."
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "tictac"
 
diff --git a/packages/opie-tinykate/opie-tinykate.inc b/packages/opie-tinykate/opie-tinykate.inc
index e012fdae4f..aeb2fddad8 100644
--- a/packages/opie-tinykate/opie-tinykate.inc
+++ b/packages/opie-tinykate/opie-tinykate.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "The Kate Text Editor for Opie"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libqtaux2"
 APPNAME = "tinykate"
diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin.inc b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin.inc
index 7d89167271..245078a2d1 100644
--- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin.inc
+++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "'fortune' plugin for Today"
 SECTION = "opie/today"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-today libqtaux2"
 RDEPENDS = "fortune-mod opie-today"
diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin.inc b/packages/opie-today-mailplugin/opie-today-mailplugin.inc
index 84a770c956..f228c619b7 100644
--- a/packages/opie-today-mailplugin/opie-today-mailplugin.inc
+++ b/packages/opie-today-mailplugin/opie-today-mailplugin.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Mail plugin for Today"
 SECTION = "opie/today"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-today opie-mailapplet"
 RDEPENDS = "opie-today opie-mailapplet"
diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin.inc b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin.inc
index d356379551..7fb97e1a5d 100644
--- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin.inc
+++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Stock ticker plugin for Today"
 SECTION = "opie/today"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-today libqtaux2"
 APPNAME = "todaystocktickerplugin"
diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin.inc b/packages/opie-today-todolistplugin/opie-today-todolistplugin.inc
index 3006d50586..00f29cee40 100644
--- a/packages/opie-today-todolistplugin/opie-today-todolistplugin.inc
+++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Todo list plugin for Today"
 SECTION = "opie/today"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-today"
 APPNAME = "todaytodolistplugin"
diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin.inc b/packages/opie-today-weatherplugin/opie-today-weatherplugin.inc
index d9e922ee49..f4f865da06 100644
--- a/packages/opie-today-weatherplugin/opie-today-weatherplugin.inc
+++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Weather plugin for Today"
 SECTION = "opie/today"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libopiecore2 libopiepim2"
 RDEPENDS = "opie-today"
diff --git a/packages/opie-today/opie-today.inc b/packages/opie-today/opie-today.inc
index ed689ed8dd..610883e8c3 100644
--- a/packages/opie-today/opie-today.inc
+++ b/packages/opie-today/opie-today.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Today screen application"
 SECTION = "opie/pim"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "today"
 
diff --git a/packages/opie-todo/opie-todo.inc b/packages/opie-todo/opie-todo.inc
index 6a6217156c..b31869fba9 100644
--- a/packages/opie-todo/opie-todo.inc
+++ b/packages/opie-todo/opie-todo.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Todo list manager"
 SECTION = "opie/pim"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-pics"
 APPNAME = "todolist"
diff --git a/packages/opie-tonleiter/opie-tonleiter.inc b/packages/opie-tonleiter/opie-tonleiter.inc
index 3970a969d0..a3108f0232 100644
--- a/packages/opie-tonleiter/opie-tonleiter.inc
+++ b/packages/opie-tonleiter/opie-tonleiter.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Music scales for string instruments"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "tonleiter"
 
diff --git a/packages/opie-unikeyboard/opie-unikeyboard.inc b/packages/opie-unikeyboard/opie-unikeyboard.inc
index aec0ce93b9..f5d6fdb687 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard.inc
+++ b/packages/opie-unikeyboard/opie-unikeyboard.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Unicode input method"
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "qunikeyboard"
 
diff --git a/packages/opie-usermanager/opie-usermanager.inc b/packages/opie-usermanager/opie-usermanager.inc
index 4701127872..63bd0bba67 100644
--- a/packages/opie-usermanager/opie-usermanager.inc
+++ b/packages/opie-usermanager/opie-usermanager.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "User/Group manager for Opie"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "usermanager"
 
diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings.inc b/packages/opie-vmemo-settings/opie-vmemo-settings.inc
index f2b0313ca5..291a47d2e9 100644
--- a/packages/opie-vmemo-settings/opie-vmemo-settings.inc
+++ b/packages/opie-vmemo-settings/opie-vmemo-settings.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Sound settings dialog"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "sound"
 
diff --git a/packages/opie-vmemo/opie-vmemo.inc b/packages/opie-vmemo/opie-vmemo.inc
index 944bb6dcfe..d055034190 100644
--- a/packages/opie-vmemo/opie-vmemo.inc
+++ b/packages/opie-vmemo/opie-vmemo.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Voice Memo Recorder Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-vmemo-settings"
 I18N_FILES = "libvmemoapplet.ts"
diff --git a/packages/opie-volumeapplet/opie-volumeapplet.inc b/packages/opie-volumeapplet/opie-volumeapplet.inc
index c253857611..6509fde926 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet.inc
+++ b/packages/opie-volumeapplet/opie-volumeapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Volume applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "volumeapplet"
 
diff --git a/packages/opie-vtapplet/opie-vtapplet.inc b/packages/opie-vtapplet/opie-vtapplet.inc
index fccf7bd70e..1a82bd7945 100644
--- a/packages/opie-vtapplet/opie-vtapplet.inc
+++ b/packages/opie-vtapplet/opie-vtapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "VT Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "vtapplet"
 
diff --git a/packages/opie-wellenreiter/opie-wellenreiter.inc b/packages/opie-wellenreiter/opie-wellenreiter.inc
index 1fb65534bd..137fe87835 100644
--- a/packages/opie-wellenreiter/opie-wellenreiter.inc
+++ b/packages/opie-wellenreiter/opie-wellenreiter.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Wireless Network Monitor"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RRECOMMENDS = "manufacturers"
 APPNAME = "wellenreiter"
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet.inc b/packages/opie-wirelessapplet/opie-wirelessapplet.inc
index 38f9fe5af5..037afc7044 100644
--- a/packages/opie-wirelessapplet/opie-wirelessapplet.inc
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Wireless Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "wirelessapplet"
 
diff --git a/packages/opie-wordgame/opie-wordgame.inc b/packages/opie-wordgame/opie-wordgame.inc
index e864e10896..45108992e8 100644
--- a/packages/opie-wordgame/opie-wordgame.inc
+++ b/packages/opie-wordgame/opie-wordgame.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Crossword game"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "wordgame"
 
diff --git a/packages/opie-write/opie-write.inc b/packages/opie-write/opie-write.inc
index 8204b25d3e..36d6cbf17e 100644
--- a/packages/opie-write/opie-write.inc
+++ b/packages/opie-write/opie-write.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Opie Write"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "opie-write"
 
diff --git a/packages/opie-zkbapplet/opie-zkbapplet.inc b/packages/opie-zkbapplet/opie-zkbapplet.inc
index 9ac3942fbb..f1b09cf53e 100644
--- a/packages/opie-zkbapplet/opie-zkbapplet.inc
+++ b/packages/opie-zkbapplet/opie-zkbapplet.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "KeyZ Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "zkbapplet"
 RDEPENDS = "opie-pics"
diff --git a/packages/opie-zlines/opie-zlines.inc b/packages/opie-zlines/opie-zlines.inc
index 12b2d08228..e0e87e793b 100644
--- a/packages/opie-zlines/opie-zlines.inc
+++ b/packages/opie-zlines/opie-zlines.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "ZLines"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "zlines"
 
diff --git a/packages/opie-zsafe/opie-zsafe.inc b/packages/opie-zsafe/opie-zsafe.inc
index 9e1fea3612..0ec2a371be 100644
--- a/packages/opie-zsafe/opie-zsafe.inc
+++ b/packages/opie-zsafe/opie-zsafe.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Password manager program for Opie."
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "zsafe"
 
diff --git a/packages/opie-zsame/opie-zsame.inc b/packages/opie-zsame/opie-zsame.inc
index 1bb445f147..d91c2bc7a4 100644
--- a/packages/opie-zsame/opie-zsame.inc
+++ b/packages/opie-zsame/opie-zsame.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "ZSame"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 APPNAME = "zsame"
 
diff --git a/packages/oprofile/oprofile_0.9.1.bb b/packages/oprofile/oprofile_0.9.1.bb
index 1cbb05d418..991c7bfc99 100644
--- a/packages/oprofile/oprofile_0.9.1.bb
+++ b/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/packages/oprofile/oprofile_cvs.bb b/packages/oprofile/oprofile_cvs.bb
index 905e78adc8..5818d2ae5c 100644
--- a/packages/oprofile/oprofile_cvs.bb
+++ b/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@cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
diff --git a/packages/orinoco/orinoco-conf_1.0.bb b/packages/orinoco/orinoco-conf_1.0.bb
index fbb748686e..6fb90970a7 100644
--- a/packages/orinoco/orinoco-conf_1.0.bb
+++ b/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/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb
index b3b5e407a5..102a6f6aa1 100644
--- a/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/packages/orinoco/orinoco-modules_0.13e.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \
 Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family."
 SECTION = "kernel/modules"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r4"
 
diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb
index 4470fc065d..b2abc152f7 100644
--- a/packages/orinoco/orinoco-modules_0.15rc1.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc1.bb
@@ -4,7 +4,6 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 DEPENDS = "orinoco-conf spectrum-fw"
 RDEPENDS = "orinoco-conf"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r7"
 
diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb
index e75924c19d..b31f1bf6c2 100644
--- a/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/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/packages/orinoco/orinoco-modules_cvs.bb b/packages/orinoco/orinoco-modules_cvs.bb
index e68375b425..5d3efec80f 100644
--- a/packages/orinoco/orinoco-modules_cvs.bb
+++ b/packages/orinoco/orinoco-modules_cvs.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 = "r2"
 
diff --git a/packages/orpheus/orpheus_1.5.bb b/packages/orpheus/orpheus_1.5.bb
index abdec85738..a686e26b52 100644
--- a/packages/orpheus/orpheus_1.5.bb
+++ b/packages/orpheus/orpheus_1.5.bb
@@ -2,7 +2,6 @@ SECTION = "console/utils"
 DESCRIPTION = "Orpheus is a light-weight text mode menu- and \
 window-driven audio player application for CDs and files in \
 MP3 and Vorbis OGG format."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
 SRC_URI = "http://thekonst.net/download/orpheus-${PV}.tar.bz2 \
diff --git a/packages/ortp/ortp_0.7.1.bb b/packages/ortp/ortp_0.7.1.bb
index 40bcfc7d0b..324d582e0a 100644
--- a/packages/ortp/ortp_0.7.1.bb
+++ b/packages/ortp/ortp_0.7.1.bb
@@ -1,5 +1,4 @@
 PR = "r0"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>
 LICENSE = "LGPL"
 DEPENDS = "glibc "
 DESCRIPTION = "An LGPL implementation of RTP - RFC3550"
diff --git a/packages/otpkeygen/otpkeygen_1.3.0.bb b/packages/otpkeygen/otpkeygen_1.3.0.bb
index 786c5ab835..0643ac445a 100644
--- a/packages/otpkeygen/otpkeygen_1.3.0.bb
+++ b/packages/otpkeygen/otpkeygen_1.3.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "OTP S/Key password generator"
 SECTION = "opie/applications"
 HOMEPAGE = "http://www.bitrot.de/pda_otpkeygen.html"
 AUTHOR = "Thomas Driemeyer <thomas@bitrot.de>"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 APPTYPE="binary"
 PR = "r2"
diff --git a/packages/p4/p4.inc b/packages/p4/p4.inc
index a473cfeea1..5a0342f14c 100644
--- a/packages/p4/p4.inc
+++ b/packages/p4/p4.inc
@@ -4,7 +4,6 @@
 
 HOMEPAGE = "http://www.perforce.com"
 DESCRIPTION = "Perforce client and server binaries"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "Perforce"
 
 def get_kernelmajorversion(p):
diff --git a/packages/pam/libpam_0.79.bb b/packages/pam/libpam_0.79.bb
index b2fb9deb8f..e76903e845 100644
--- a/packages/pam/libpam_0.79.bb
+++ b/packages/pam/libpam_0.79.bb
@@ -15,7 +15,6 @@ how individual applications authenticate users. For an \
 overview of the Linux-PAM library see the Linux-PAM System \
 Administrators' Guide."
 HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL-2"
diff --git a/packages/panoramixext/panoramixext_1.1.bb b/packages/panoramixext/panoramixext_1.1.bb
index a77a508392..c2627c5bc1 100644
--- a/packages/panoramixext/panoramixext_1.1.bb
+++ b/packages/panoramixext/panoramixext_1.1.bb
@@ -1,7 +1,6 @@
 SECTION = "libs"
 LICENSE= "MIT"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "PanoramiX extension headers"
 
 SRC_URI = "${XLIBS_MIRROR}/panoramixext-${PV}.tar.bz2"
diff --git a/packages/panoramixext/panoramixext_cvs.bb b/packages/panoramixext/panoramixext_cvs.bb
index cd35d0d34c..e8dbe1e082 100644
--- a/packages/panoramixext/panoramixext_cvs.bb
+++ b/packages/panoramixext/panoramixext_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE= "MIT"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "PanoramiX extension headers"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=PanoramiXExt"
diff --git a/packages/parted/parted_1.6.23.bb b/packages/parted/parted_1.6.23.bb
index d4182487fe..cb9b08f407 100644
--- a/packages/parted/parted_1.6.23.bb
+++ b/packages/parted/parted_1.6.23.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "parted, the GNU partition resizing program"
 HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv2"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs-libs"
 PR = "r0"
diff --git a/packages/parted/parted_1.6.25.1.bb b/packages/parted/parted_1.6.25.1.bb
index 34ea5a5b25..8681055855 100644
--- a/packages/parted/parted_1.6.25.1.bb
+++ b/packages/parted/parted_1.6.25.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "parted, the GNU partition resizing program"
 HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv2"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs-libs"
 PR = "r0"
diff --git a/packages/patch/patch.inc b/packages/patch/patch.inc
index 1cac1732ea..c8240ca3a9 100644
--- a/packages/patch/patch.inc
+++ b/packages/patch/patch.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "patch takes a patch file containing a difference listing \
 produced by the diff program and applies those differences to one or more \
 original files, producing patched versions."
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "standard"
 SECTION = "utils"
 
diff --git a/packages/patchutils/patchutils_0.2.25.bb b/packages/patchutils/patchutils_0.2.25.bb
index 001c1aed6c..f43a274a8f 100644
--- a/packages/patchutils/patchutils_0.2.25.bb
+++ b/packages/patchutils/patchutils_0.2.25.bb
@@ -1,7 +1,6 @@
 SECTION = "devel"
 LICENSE = "GPL"
 DESCRIPTION = "Patchutils is a small collection of programs that operate on patch files."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 
 SRC_URI = "http://cyberelk.net/tim/data/patchutils/stable/patchutils-${PV}.tar.bz2"
diff --git a/packages/patchutils/patchutils_0.2.26.bb b/packages/patchutils/patchutils_0.2.26.bb
index 001c1aed6c..f43a274a8f 100644
--- a/packages/patchutils/patchutils_0.2.26.bb
+++ b/packages/patchutils/patchutils_0.2.26.bb
@@ -1,7 +1,6 @@
 SECTION = "devel"
 LICENSE = "GPL"
 DESCRIPTION = "Patchutils is a small collection of programs that operate on patch files."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 
 SRC_URI = "http://cyberelk.net/tim/data/patchutils/stable/patchutils-${PV}.tar.bz2"
diff --git a/packages/patchutils/patchutils_0.2.27.bb b/packages/patchutils/patchutils_0.2.27.bb
index 001c1aed6c..f43a274a8f 100644
--- a/packages/patchutils/patchutils_0.2.27.bb
+++ b/packages/patchutils/patchutils_0.2.27.bb
@@ -1,7 +1,6 @@
 SECTION = "devel"
 LICENSE = "GPL"
 DESCRIPTION = "Patchutils is a small collection of programs that operate on patch files."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 
 SRC_URI = "http://cyberelk.net/tim/data/patchutils/stable/patchutils-${PV}.tar.bz2"
diff --git a/packages/patchutils/patchutils_0.2.28.bb b/packages/patchutils/patchutils_0.2.28.bb
index 001c1aed6c..f43a274a8f 100644
--- a/packages/patchutils/patchutils_0.2.28.bb
+++ b/packages/patchutils/patchutils_0.2.28.bb
@@ -1,7 +1,6 @@
 SECTION = "devel"
 LICENSE = "GPL"
 DESCRIPTION = "Patchutils is a small collection of programs that operate on patch files."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 
 SRC_URI = "http://cyberelk.net/tim/data/patchutils/stable/patchutils-${PV}.tar.bz2"
diff --git a/packages/patchutils/patchutils_0.2.30.bb b/packages/patchutils/patchutils_0.2.30.bb
index 001c1aed6c..f43a274a8f 100644
--- a/packages/patchutils/patchutils_0.2.30.bb
+++ b/packages/patchutils/patchutils_0.2.30.bb
@@ -1,7 +1,6 @@
 SECTION = "devel"
 LICENSE = "GPL"
 DESCRIPTION = "Patchutils is a small collection of programs that operate on patch files."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 
 SRC_URI = "http://cyberelk.net/tim/data/patchutils/stable/patchutils-${PV}.tar.bz2"
diff --git a/packages/pax-utils/pax-utils_0.1.13.bb b/packages/pax-utils/pax-utils_0.1.13.bb
index 0e514673b0..6fc6850142 100644
--- a/packages/pax-utils/pax-utils_0.1.13.bb
+++ b/packages/pax-utils/pax-utils_0.1.13.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Various ELF utilities"
 HOMEPAGE    = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml"
 LICENSE     = "GPLv2"
-MAINTAINER  = "freyther@handhelds.org"
 
 SRC_URI     = "${GENTOO_MIRROR}/pax-utils-${PV}.tar.bz2;md5sum=5f09df47a16e83462384b44b75310539"
 S           = "${WORKDIR}/pax-utils-${PV}"
diff --git a/packages/pcmanfm/pcmanfm_0.1.9.8.bb b/packages/pcmanfm/pcmanfm_0.1.9.8.bb
index f35d0d4454..b5cb3d6e5c 100644
--- a/packages/pcmanfm/pcmanfm_0.1.9.8.bb
+++ b/packages/pcmanfm/pcmanfm_0.1.9.8.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "procfs tools"
 SECTION = "x11"
 PRIORITY = "optional"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DEPENDS = "gtk+"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
diff --git a/packages/perl/libalgorithm-diff-perl_1.1902.bb b/packages/perl/libalgorithm-diff-perl_1.1902.bb
index e2776b98d3..1021b4c77c 100644
--- a/packages/perl/libalgorithm-diff-perl_1.1902.bb
+++ b/packages/perl/libalgorithm-diff-perl_1.1902.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Algorithm::Diff - Compute intelligent differences between two files / lists"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-exporter perl-module-strict perl-module-vars \
 	     perl-module-strict perl-module-vars"
diff --git a/packages/perl/libarchive-tar-perl_1.30.bb b/packages/perl/libarchive-tar-perl_1.30.bb
index 2a88a3908d..b58506688b 100644
--- a/packages/perl/libarchive-tar-perl_1.30.bb
+++ b/packages/perl/libarchive-tar-perl_1.30.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Archive::Tar - module for manipulations of tar archives"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS += "libio-zlib-perl-native"
 RDEPENDS += "libio-zlib-perl"
diff --git a/packages/perl/libcache-cache-perl_1.05.bb b/packages/perl/libcache-cache-perl_1.05.bb
index f18edeeda2..c90e9fed53 100644
--- a/packages/perl/libcache-cache-perl_1.05.bb
+++ b/packages/perl/libcache-cache-perl_1.05.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Cache::Cache -- the Cache interface."
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \
            libipc-sharelite-perl-native"
diff --git a/packages/perl/libclass-container-perl_0.12.bb b/packages/perl/libclass-container-perl_0.12.bb
index f205d7358a..6395cfc890 100644
--- a/packages/perl/libclass-container-perl_0.12.bb
+++ b/packages/perl/libclass-container-perl_0.12.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Class::Container - Glues object frameworks together transparently"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS = "libparams-validate-perl-native"
 RDEPENDS = "libparams-validate-perl"
diff --git a/packages/perl/libclass-data-inheritable-perl_0.06.bb b/packages/perl/libclass-data-inheritable-perl_0.06.bb
index 079e91cdc2..71a1f76526 100644
--- a/packages/perl/libclass-data-inheritable-perl_0.06.bb
+++ b/packages/perl/libclass-data-inheritable-perl_0.06.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Class::Data::Inheritable - Inheritable, overridable class data"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r3"
 
diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb
index 0452c79ea9..8631e1da02 100644
--- a/packages/perl/libcompress-zlib-perl_1.42.bb
+++ b/packages/perl/libcompress-zlib-perl_1.42.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Compress::Zlib - Interface to zlib compression library"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r3"
 
diff --git a/packages/perl/libdata-optlist-perl_0.101.bb b/packages/perl/libdata-optlist-perl_0.101.bb
index 13d15290a8..40a2da46a7 100644
--- a/packages/perl/libdata-optlist-perl_0.101.bb
+++ b/packages/perl/libdata-optlist-perl_0.101.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Data::OptList - parse and validate simple name/value option pairs"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS += "libsub-install-perl-native libparams-util-perl-native"
 RDEPENDS += "perl-module-list-util libparams-util-perl perl-module-strict \
diff --git a/packages/perl/libdevel-stacktrace-perl_1.13.bb b/packages/perl/libdevel-stacktrace-perl_1.13.bb
index 58e1c6af86..e5414895b0 100644
--- a/packages/perl/libdevel-stacktrace-perl_1.13.bb
+++ b/packages/perl/libdevel-stacktrace-perl_1.13.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Devel::StackTrace - Stack trace and stack trace frame objects"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r3"
 
diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb
index faebcaf29b..5e482164bb 100644
--- a/packages/perl/libdigest-sha1-perl_2.11.bb
+++ b/packages/perl/libdigest-sha1-perl_2.11.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r7"
 
diff --git a/packages/perl/liberror-perl_0.17004.bb b/packages/perl/liberror-perl_0.17004.bb
index 2f47f057cd..b41b4ce50e 100644
--- a/packages/perl/liberror-perl_0.17004.bb
+++ b/packages/perl/liberror-perl_0.17004.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Error - Error/exception handling in an OO-ish way"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r4"
 
diff --git a/packages/perl/libexception-class-perl_1.23.bb b/packages/perl/libexception-class-perl_1.23.bb
index 03d5529e15..3255fc582d 100644
--- a/packages/perl/libexception-class-perl_1.23.bb
+++ b/packages/perl/libexception-class-perl_1.23.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Exception::Class - A module that allows you to declare real exception classes in Perl"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS = "libclass-data-inheritable-perl-native libdevel-stacktrace-perl-native"
 RDEPENDS = "libclass-data-inheritable-perl libdevel-stacktrace-perl"
diff --git a/packages/perl/libextutils-cbuilder-perl_0.18.bb b/packages/perl/libextutils-cbuilder-perl_0.18.bb
index 0323c6621f..bf6df4cc16 100644
--- a/packages/perl/libextutils-cbuilder-perl_0.18.bb
+++ b/packages/perl/libextutils-cbuilder-perl_0.18.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "ExtUtils::CBuilder - Compile and link C code for Perl modules"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r1"
 
diff --git a/packages/perl/libextutils-parsexs-perl_2.16.bb b/packages/perl/libextutils-parsexs-perl_2.16.bb
index e168f54275..abd92a34ba 100644
--- a/packages/perl/libextutils-parsexs-perl_2.16.bb
+++ b/packages/perl/libextutils-parsexs-perl_2.16.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "ExtUtils::ParseXS - converts Perl XS code into C code"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r1"
 
diff --git a/packages/perl/libio-zlib-perl_1.04.bb b/packages/perl/libio-zlib-perl_1.04.bb
index 4810c3fda1..aa6680bc84 100644
--- a/packages/perl/libio-zlib-perl_1.04.bb
+++ b/packages/perl/libio-zlib-perl_1.04.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "IO::Zlib - IO:: style interface to Compress::Zlib"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS = "libcompress-zlib-perl-native"
 RDEPENDS += "libcompress-zlib-perl"
diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb
index 4775c6cf65..cd7c19fb2a 100644
--- a/packages/perl/libipc-sharelite-perl_0.09.bb
+++ b/packages/perl/libipc-sharelite-perl_0.09.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r7"
 
diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb
index debcdc6df1..b4fe0b2f2c 100644
--- a/packages/perl/liblocale-gettext-perl_1.05.bb
+++ b/packages/perl/liblocale-gettext-perl_1.05.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Locale::gettext - message handling functions"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/libintl"
 PR = "r3"
diff --git a/packages/perl/liblog-dispatch-perl_2.13.bb b/packages/perl/liblog-dispatch-perl_2.13.bb
index 1fa6ac1e6a..d44aea9329 100644
--- a/packages/perl/liblog-dispatch-perl_2.13.bb
+++ b/packages/perl/liblog-dispatch-perl_2.13.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Log::Dispatch - Dispatches messages to one or more outputs"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r2"
 
diff --git a/packages/perl/liblog-log4perl-perl_1.06.bb b/packages/perl/liblog-log4perl-perl_1.06.bb
index 92b3abcb4e..75060cce6a 100644
--- a/packages/perl/liblog-log4perl-perl_1.06.bb
+++ b/packages/perl/liblog-log4perl-perl_1.06.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Log::Log4perl - Log4j implementation for Perl"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r1"
 
diff --git a/packages/perl/libmath-bigint-gmp-perl_1.18.bb b/packages/perl/libmath-bigint-gmp-perl_1.18.bb
index 808d1065b5..d850ab71f1 100644
--- a/packages/perl/libmath-bigint-gmp-perl_1.18.bb
+++ b/packages/perl/libmath-bigint-gmp-perl_1.18.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Math::BigInt::GMP - Use the GMP library for Math::BigInt routines"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS += "gmp-native"
 RDEPENDS += "gmp"
diff --git a/packages/perl/libmodule-build-perl_0.2805.bb b/packages/perl/libmodule-build-perl_0.2805.bb
index f8910f406d..2c6a772bca 100644
--- a/packages/perl/libmodule-build-perl_0.2805.bb
+++ b/packages/perl/libmodule-build-perl_0.2805.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Module::Build - Build and install Perl modules"
 SECTION = "libs"
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2805.tar.gz"
 LICENSE = "Artistic|GPL"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 DEPENDS = "libyaml-perl-native libversion-perl-native \
            libextutils-cbuilder-perl-native \
            libextutils-parsexs-perl-native \
diff --git a/packages/perl/libnet-ip-perl_1.25.bb b/packages/perl/libnet-ip-perl_1.25.bb
index d1b94e1547..183acc8eef 100644
--- a/packages/perl/libnet-ip-perl_1.25.bb
+++ b/packages/perl/libnet-ip-perl_1.25.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Net::IP - Perl extension for manipulating IPv4/IPv6 addresses"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS += "libio-zlib-perl-native"
 RDEPENDS += "libio-zlib-perl perl-module-math-bigint"
diff --git a/packages/perl/libparams-util-perl_0.20.bb b/packages/perl/libparams-util-perl_0.20.bb
index 31738c0016..deb3c58b31 100644
--- a/packages/perl/libparams-util-perl_0.20.bb
+++ b/packages/perl/libparams-util-perl_0.20.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Params::Util - Simple, compact and correct param-checking functions"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-exporter perl-module-overload \
              perl-module-scalar-util perl-module-strict perl-module-vars"
diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb
index 3ffb38e8ba..8b1f9583ed 100644
--- a/packages/perl/libparams-validate-perl_0.86.bb
+++ b/packages/perl/libparams-validate-perl_0.86.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Params::Validate - Validate method/function parameters"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r7"
 
diff --git a/packages/perl/libperl6-junction-perl_1.10.bb b/packages/perl/libperl6-junction-perl_1.10.bb
index e0a43cef52..dda3cf4be3 100644
--- a/packages/perl/libperl6-junction-perl_1.10.bb
+++ b/packages/perl/libperl6-junction-perl_1.10.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Perl6::Junction - Perl6 style Junction operators in Perl5."
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r0"
 
diff --git a/packages/perl/libsub-exporter-perl_0.970.bb b/packages/perl/libsub-exporter-perl_0.970.bb
index 1adf152a3c..5d56090549 100644
--- a/packages/perl/libsub-exporter-perl_0.970.bb
+++ b/packages/perl/libsub-exporter-perl_0.970.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Sub::Exporter - a sophisticated exporter for custom-built routines"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS += "libdata-optlist-perl-native libsub-install-perl-native \
             libparams-util-perl-native"
diff --git a/packages/perl/libsub-install-perl_0.922.bb b/packages/perl/libsub-install-perl_0.922.bb
index f867886444..ef8607312f 100644
--- a/packages/perl/libsub-install-perl_0.922.bb
+++ b/packages/perl/libsub-install-perl_0.922.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Sub::Install - install subroutines into packages easily"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-carp perl-module-scalar-util perl-module-strict \
              perl-module-warnings"
diff --git a/packages/perl/libsub-uplevel-perl_0.13.bb b/packages/perl/libsub-uplevel-perl_0.13.bb
index ba4c0efe38..8c66f49031 100644
--- a/packages/perl/libsub-uplevel-perl_0.13.bb
+++ b/packages/perl/libsub-uplevel-perl_0.13.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Sub::Uplevel - apparently run a function in a higher stack frame"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-exporter perl-module-strict perl-module-vars"
 PR = "r0"
diff --git a/packages/perl/libtest-builder-tester-perl_1.01.bb b/packages/perl/libtest-builder-tester-perl_1.01.bb
index 0c44fff883..860194ebb8 100644
--- a/packages/perl/libtest-builder-tester-perl_1.01.bb
+++ b/packages/perl/libtest-builder-tester-perl_1.01.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Test::Builder::Tester - test testsuites that have been built with Test::Builder"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-strict perl-module-carp perl-module-exporter \
              perl-module-symbol perl-module-vars"
diff --git a/packages/perl/libtest-differences-perl_0.47.bb b/packages/perl/libtest-differences-perl_0.47.bb
index 7a1311b23e..baf0c4c6e3 100644
--- a/packages/perl/libtest-differences-perl_0.47.bb
+++ b/packages/perl/libtest-differences-perl_0.47.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Test::Differences - Test strings and data structures and show differences if not ok"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS += "libtext-diff-perl-native"
 RDEPENDS += "perl-module-carp perl-module-constant perl-module-exporter \
diff --git a/packages/perl/libtest-exception-perl_0.22.bb b/packages/perl/libtest-exception-perl_0.22.bb
index 9dffa1341e..c87f6a803f 100644
--- a/packages/perl/libtest-exception-perl_0.22.bb
+++ b/packages/perl/libtest-exception-perl_0.22.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Test::Exception - Test exception based code"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS += "libsub-uplevel-perl-native"
 RDEPENDS += "perl-module-base perl-module-carp perl-module-strict \
diff --git a/packages/perl/libtest-mockmodule-perl_0.05.bb b/packages/perl/libtest-mockmodule-perl_0.05.bb
index f72665ba94..41f35b7a82 100644
--- a/packages/perl/libtest-mockmodule-perl_0.05.bb
+++ b/packages/perl/libtest-mockmodule-perl_0.05.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Test::MockModule - Override subroutines in a module for unit testing"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-carp perl-module-scalar-util perl-module-strict \
              perl-module-vars "
diff --git a/packages/perl/libtest-output-perl_0.10.bb b/packages/perl/libtest-output-perl_0.10.bb
index 74ac8b11e9..bce6b9e1b3 100644
--- a/packages/perl/libtest-output-perl_0.10.bb
+++ b/packages/perl/libtest-output-perl_0.10.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Test::Output - Utilities to test STDOUT and STDERR messages"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS += "libsub-exporter-perl-native"
 RDEPENDS += "libsub-exporter-perl"
diff --git a/packages/perl/libtext-diff-perl_0.35.bb b/packages/perl/libtext-diff-perl_0.35.bb
index aac4598055..40a6373a8f 100644
--- a/packages/perl/libtext-diff-perl_0.35.bb
+++ b/packages/perl/libtext-diff-perl_0.35.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Text::Diff - Perform diffs on files and record sets"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS += "libalgorithm-diff-perl-native"
 RDEPENDS += "libalgorithm-diff-perl perl-module-carp perl-module-constant \
diff --git a/packages/perl/libversion-perl_0.6701.bb b/packages/perl/libversion-perl_0.6701.bb
index 27c5dc1322..b78397e9e6 100644
--- a/packages/perl/libversion-perl_0.6701.bb
+++ b/packages/perl/libversion-perl_0.6701.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "version - Perl extension for Version Objects"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 PR = "r2"
 
diff --git a/packages/perl/libyaml-perl_0.62.bb b/packages/perl/libyaml-perl_0.62.bb
index 49034dc001..31ebc53040 100644
--- a/packages/perl/libyaml-perl_0.62.bb
+++ b/packages/perl/libyaml-perl_0.62.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "YAML - YAML Ain't Markup Language (tm)"
 SECTION = "libs"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "Artistic|GPL"
 DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \
            libipc-sharelite-perl-native"
diff --git a/packages/perl/perl-native_5.8.7.bb b/packages/perl/perl-native_5.8.7.bb
index af7680f013..338d1617cc 100644
--- a/packages/perl/perl-native_5.8.7.bb
+++ b/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/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 68d96cb418..05e1f1c3df 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -1,4 +1,3 @@
-MAINTAINER="David Karlstrom <daka@thg.se>"
 
 # We need gnugrep (for -I)
 DEPENDS_append += " grep-native"
diff --git a/packages/petitepainture/petitepainture_1.5.bb b/packages/petitepainture/petitepainture_1.5.bb
index 1a6b80bab2..46f015e9bd 100644
--- a/packages/petitepainture/petitepainture_1.5.bb
+++ b/packages/petitepainture/petitepainture_1.5.bb
@@ -6,7 +6,6 @@ LICENSE = "GPL"
 APPTYPE = "binary"
 APPNAME = "petitpeintu"
 APPDESKTOP = "${WORKDIR}"
-MAINTAINER = "Frederic Devernay <frederic.devernay@m4x.org>"
 
 SRC_URI = "http://sun.dhis.portside.net/~sakira/archive/SPainter_1.5_src.tar.gz \
            file://dialogs.patch;patch=1 \
diff --git a/packages/phalanx/phalanx_22.bb b/packages/phalanx/phalanx_22.bb
index fda5e4cbca..d8d44e70b8 100644
--- a/packages/phalanx/phalanx_22.bb
+++ b/packages/phalanx/phalanx_22.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Phalanx is a chess playing engine."
 SECTION = "opie/libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer"
 PR = "r3"
 LICENSE = "GPL"
 SRC_URI = "http://dusan.freeshell.org/phalanx/phalanx-${PV}.tar.gz \
diff --git a/packages/php/php.inc b/packages/php/php.inc
index dddd11cd5e..da2e928528 100644
--- a/packages/php/php.inc
+++ b/packages/php/php.inc
@@ -1,6 +1,5 @@
 SECTION = "console/network"
 DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "PHP"
 SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \
            file://${FILESDIR}/autotools.patch;patch=1 \
diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb
index fc982a678c..da116fbf7f 100644
--- a/packages/php/php_5.1.4.bb
+++ b/packages/php/php_5.1.4.bb
@@ -1,6 +1,5 @@
 SECTION = "console/network"
 DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
-MAINTAINER = "Shane Volpe <shanevolpe@gmail.com>"
 LICENSE = "PHP"
 DEPENDS = "zlib libxml2 mysql libiconv"
 SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\
diff --git a/packages/picocom/picocom_1.3.bb b/packages/picocom/picocom_1.3.bb
index b747569033..6c8bd0eb37 100644
--- a/packages/picocom/picocom_1.3.bb
+++ b/packages/picocom/picocom_1.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Picocom is a lightweight and minimal (~20K) dumb-terminal emulation program. "
 SECTION = "console/utils"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SRC_URI = "http://efault.net/npat/hacks/picocom/dist/picocom-${PV}.tar.gz"
 
diff --git a/packages/picocom/picocom_1.4.bb b/packages/picocom/picocom_1.4.bb
index 161178bf2e..04640903b5 100644
--- a/packages/picocom/picocom_1.4.bb
+++ b/packages/picocom/picocom_1.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Picocom is a lightweight and minimal (~20K) dumb-terminal emulation program. "
 SECTION = "console/utils"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SRC_URI = "http://efault.net/npat/hacks/picocom/dist/picocom-${PV}.tar.gz"
 
diff --git a/packages/pine/pine_4.63.bb b/packages/pine/pine_4.63.bb
index 93f9b4a9cf..1bcb451f52 100644
--- a/packages/pine/pine_4.63.bb
+++ b/packages/pine/pine_4.63.bb
@@ -4,7 +4,6 @@ LICENSE = "Pine"
 DEPENDS = "ncurses openssl"
 RDEPENDS_pine = "pico"
 HOMEPAGE = "http://www.washington.edu/pine/"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "ftp://ftp.cac.washington.edu/pine/old/pine${PV}.tar.Z"
 S = "${WORKDIR}/pine${PV}"
diff --git a/packages/pipepanic/pipepanic_0.1.1.bb b/packages/pipepanic/pipepanic_0.1.1.bb
index 9538f8b547..d1505b3b7a 100644
--- a/packages/pipepanic/pipepanic_0.1.1.bb
+++ b/packages/pipepanic/pipepanic_0.1.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Pipepanic is a pipe connecting game using libSDL. \
 Connect as many different shaped pipes together as possible within the time given."
 HOMEPAGE = "http://www.users.waitrose.com/~thunor/pipepanic/"
 LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r1"
 
 SRC_URI = "http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-${PV}-source.tar.gz \
diff --git a/packages/plone/plone_2.1.2.bb b/packages/plone/plone_2.1.2.bb
index e0b9a872a5..4d56a9a597 100644
--- a/packages/plone/plone_2.1.2.bb
+++ b/packages/plone/plone_2.1.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Plone, a user friendly and powerful Content Management System based on the Zope Web Application Server"
 SECTION = "network/cms"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 RDEPENDS = "zope"
 LICENSE = "GPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/plone/Plone-${PV}.tar.gz"
diff --git a/packages/pocketcellar/pocketcellar_1.1.bb b/packages/pocketcellar/pocketcellar_1.1.bb
index c7d1815e44..31f15dab59 100644
--- a/packages/pocketcellar/pocketcellar_1.1.bb
+++ b/packages/pocketcellar/pocketcellar_1.1.bb
@@ -3,7 +3,6 @@ those you have in your cellar. The Food Assistant will make suggestions of wines
 suitable for your meal, and indicate those in your cellar that match."
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r3"
 
diff --git a/packages/poppler/poppler_0.5.1.bb b/packages/poppler/poppler_0.5.1.bb
index a974c66243..f39e7fe8d9 100644
--- a/packages/poppler/poppler_0.5.1.bb
+++ b/packages/poppler/poppler_0.5.1.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "fontconfig jpeg gtk+ cairo"
 LICENSE = "GPL"
 PR = "r1"
diff --git a/packages/poppler/poppler_0.5.3.bb b/packages/poppler/poppler_0.5.3.bb
index a974c66243..f39e7fe8d9 100644
--- a/packages/poppler/poppler_0.5.3.bb
+++ b/packages/poppler/poppler_0.5.3.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "fontconfig jpeg gtk+ cairo"
 LICENSE = "GPL"
 PR = "r1"
diff --git a/packages/poppler/poppler_20060418.bb b/packages/poppler/poppler_20060418.bb
index 16ec699657..358e1df842 100644
--- a/packages/poppler/poppler_20060418.bb
+++ b/packages/poppler/poppler_20060418.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "fontconfig jpeg gtk+ cairo"
 LICENSE = "GPL"
 PV = "0.5.1+cvs20060418"
diff --git a/packages/poptop/poptop_1.3.0.bb b/packages/poptop/poptop_1.3.0.bb
index 2d8c59a2f1..a8bd12a31f 100644
--- a/packages/poptop/poptop_1.3.0.bb
+++ b/packages/poptop/poptop_1.3.0.bb
@@ -4,7 +4,6 @@ This enables administrators to leverage the considerable benefits of both Micros
 The current release version supports Windows 95/98/Me/NT/2000/XP PPTP clients and Linux PPTP clients \
 For more info visit http://www.poptop.org/"
 
-MAINTAINER  = "Stelios Koroneos <skoroneos@digital-opsis.com> "
 HOMEPAGE    = "http://www.poptop.org/"	
 LICENSE     = "GPL"
 SECTION     = "network"
diff --git a/packages/poqetpresenter/poqetpresenter_0.0.6.bb b/packages/poqetpresenter/poqetpresenter_0.0.6.bb
index c4646b9075..e513e9721e 100644
--- a/packages/poqetpresenter/poqetpresenter_0.0.6.bb
+++ b/packages/poqetpresenter/poqetpresenter_0.0.6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "OpenOffice.org Impress presentation viewer for Qt/E based Palmtop environments"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://poqetp.sourceforge.net/"
 PR = "r2"
diff --git a/packages/portaudio/portaudio_0.0.19.bb b/packages/portaudio/portaudio_0.0.19.bb
index efb3cc31db..3b4871ba17 100644
--- a/packages/portaudio/portaudio_0.0.19.bb
+++ b/packages/portaudio/portaudio_0.0.19.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A portable audio library"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PV = "1:0.0.19+cvs${SRCDATE}"
 PR = "r1"
diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb
index a93ae3ddc4..c8d9220da6 100644
--- a/packages/povray/povray_3.6.1.bb
+++ b/packages/povray/povray_3.6.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "The Persistence of Vision Raytracer is a high-quality, totally fr
 HOMEPAGE = "http://www.povray.org"
 SECTION = "console/graphics"
 #Make this a weak assigment to allow branding of the povray binary 
-MAINTAINER ?= "Koen Kooi <koen@openembedded.org>"
 LICENSE = "povray"
 
 DEPENDS = "virtual/libx11 libz jpeg libpng tiff"
@@ -16,7 +15,6 @@ SRC_URI = "http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-x COMPILED_BY=${MAINTAINER}" 
 PARALLEL_MAKE = ""
 
 #autoreconf breaks, so we'll skip that. The added advantage is that the patch to ./configure actually has effect
diff --git a/packages/powermanga/powermanga_0.79.bb b/packages/powermanga/powermanga_0.79.bb
index 36ebdddc2b..194f245e3a 100644
--- a/packages/powermanga/powermanga_0.79.bb
+++ b/packages/powermanga/powermanga_0.79.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Powermanga is an arcade 2D shoot-em-up game with 41 levels and more than 200 sprites."
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libsdl-qpe libsdl-mixer"
 PR = "r1"
diff --git a/packages/powernowd/powernowd_0.96.bb b/packages/powernowd/powernowd_0.96.bb
index 0d953fe0b8..9230239bc4 100644
--- a/packages/powernowd/powernowd_0.96.bb
+++ b/packages/powernowd/powernowd_0.96.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A daemon to manage CPUfreq states"
 HOMEPAGE = "http://www.deater.net/john/powernowd.html"
 LICENSE = "GPLv2"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 
 SRC_URI = "http://www.deater.net/john/${P}.tar.gz \
diff --git a/packages/ppp-dialin/ppp-dialin_0.1.bb b/packages/ppp-dialin/ppp-dialin_0.1.bb
index 815ed14d3b..f0d410e455 100644
--- a/packages/ppp-dialin/ppp-dialin_0.1.bb
+++ b/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/packages/ppp-dsl/ppp-dsl_0.1.bb b/packages/ppp-dsl/ppp-dsl_0.1.bb
index 0d30031602..8796da86da 100644
--- a/packages/ppp-dsl/ppp-dsl_0.1.bb
+++ b/packages/ppp-dsl/ppp-dsl_0.1.bb
@@ -1,6 +1,5 @@
 SECTION = "console/network"
 DESCRIPTION = "Enables PPP dial-in through a DSL connection"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "PD"
 DEPENDS = "ppp rp-pppoe"
 RDEPENDS = "ppp rp-pppoe"
diff --git a/packages/prboom/prboom-devconfig.bb b/packages/prboom/prboom-devconfig.bb
index bcfcee14cd..602adcd444 100644
--- a/packages/prboom/prboom-devconfig.bb
+++ b/packages/prboom/prboom-devconfig.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Device specific configuration for prboom"
 SECTION = "games"
 PRIORITY = "optional"
-MAINTAINER = "coredump@handhelds.org"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/prism3-support/prism3-support_1.0.0.bb b/packages/prism3-support/prism3-support_1.0.0.bb
index 85f1391ed4..830da22c2b 100644
--- a/packages/prism3-support/prism3-support_1.0.0.bb
+++ b/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/packages/prism54/prism54-firmware_1.0.3.0.bb b/packages/prism54/prism54-firmware_1.0.3.0.bb
index 33138ca064..ef7fbad5e2 100644
--- a/packages/prism54/prism54-firmware_1.0.3.0.bb
+++ b/packages/prism54/prism54-firmware_1.0.3.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Firmware for the Prism54 driver"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "unknown"
 
 SRC_URI = "http://prism54.org/~mcgrof/firmware/${PV}.arm"
diff --git a/packages/prism54/prism54-firmware_1.0.4.3.bb b/packages/prism54/prism54-firmware_1.0.4.3.bb
index ebcef7233c..dde87f2e65 100644
--- a/packages/prism54/prism54-firmware_1.0.4.3.bb
+++ b/packages/prism54/prism54-firmware_1.0.4.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Firmware for the Prism54 driver"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 
 SRC_URI = "http://prism54.org/~mcgrof/firmware/${PV}.arm"
diff --git a/packages/prism54/prism54-module_1.2.bb b/packages/prism54/prism54-module_1.2.bb
index a986fc404d..f7b0c17fa9 100644
--- a/packages/prism54/prism54-module_1.2.bb
+++ b/packages/prism54/prism54-module_1.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Linux Driver for the 802.11g Prism GT / Prism Duette / Prism Indigo Chipsets"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 HOMEPAGE = "http://prism54.org"
 LICENSE = "GPL"
 RDEPENDS = "kernel (${KERNEL_VERSION}) prism54-firmware (1.0.3.0) hotplug"
diff --git a/packages/prismstumbler/prismstumbler_0.7.2.bb b/packages/prismstumbler/prismstumbler_0.7.2.bb
index 9658d11106..4cb390ce33 100644
--- a/packages/prismstumbler/prismstumbler_0.7.2.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.2.bb
@@ -4,7 +4,6 @@ PR = "r1"
 PACKAGES = "prismstumbler prismstumbler-frontend"
 DESCRIPTION = "Prismstumbler wireless LAN scanner"
 LICENSE = "GPL"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 DEPENDS = "libpcap gtk+ wireless-tools sqlite"
 
 
diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb
index 0f78679db9..8699e5668b 100644
--- a/packages/prismstumbler/prismstumbler_0.7.3.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3.bb
@@ -4,7 +4,6 @@ PR = "r4"
 PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc"
 DESCRIPTION = "Prismstumbler wireless LAN scanner"
 LICENSE = "GPL"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib"
 RDEPENDS = "wireless-tools"
 
diff --git a/packages/privoxy/privoxy_3.0.3.bb b/packages/privoxy/privoxy_3.0.3.bb
index e9bd71e45e..e475182f54 100644
--- a/packages/privoxy/privoxy_3.0.3.bb
+++ b/packages/privoxy/privoxy_3.0.3.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "Privoxy is a web proxy with advanced filtering capabilities for p
                removing ads, banners, pop-ups and other obnoxious Internet junk."
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "Bastian Ballmann <balle@chaostal.de>"
 LICENSE = "GPL"
 DEPENDS = "pcre"
 PR = "r0"
diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb
index cc0e1a21c5..0aaf82a92a 100644
--- a/packages/procps/procps_3.2.5.bb
+++ b/packages/procps/procps_3.2.5.bb
@@ -5,7 +5,6 @@ about processes using the /proc filesystem. The package \
 includes the programs ps, top, vmstat, w, kill, and skill."
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>"
 DEPENDS = "ncurses"
 PR = "r5"
 
diff --git a/packages/psmisc/psmisc.inc b/packages/psmisc/psmisc.inc
index 810cc5309f..0d8faf1ed6 100644
--- a/packages/psmisc/psmisc.inc
+++ b/packages/psmisc/psmisc.inc
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "procfs tools"
 SECTION = "base"
 PRIORITY = "required"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "ncurses virtual/libintl"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
diff --git a/packages/psmisc/psmisc_20.2.bb b/packages/psmisc/psmisc_20.2.bb
index 0f742b8ef5..a6140e7414 100644
--- a/packages/psmisc/psmisc_20.2.bb
+++ b/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/packages/pulseaudio/pulseaudio_0.9.2.bb b/packages/pulseaudio/pulseaudio_0.9.2.bb
index 8cfabf513c..abfc42957f 100644
--- a/packages/pulseaudio/pulseaudio_0.9.2.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.2.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.pulseaudio.org"
 AUTHOR = "Lennart Poettering"
 SECTION = "libs/multimedia"
 LICENSE = "LGPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "liboil libsamplerate0 libsndfile1 libtool"
 # optional
 DEPENDS += "alsa-lib"
diff --git a/packages/puppy/puppy_1.11.bb b/packages/puppy/puppy_1.11.bb
index 89c8dc4317..4904d870ab 100644
--- a/packages/puppy/puppy_1.11.bb
+++ b/packages/puppy/puppy_1.11.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Interface software for the TopField TF5000PVRt"
 SECTION = "network"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 HOMEPAGE = "http://sf.net/projects/puppy/"
 LICENSE = "GPL"
 PR = "r2"
diff --git a/packages/puppy/puppy_1.8.bb b/packages/puppy/puppy_1.8.bb
index 1b672c7c45..9d007b2eb3 100644
--- a/packages/puppy/puppy_1.8.bb
+++ b/packages/puppy/puppy_1.8.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Interface software for the TopField TF5000PVRt"
 SECTION = "network"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 HOMEPAGE = "http://sf.net/projects/puppy/"
 LICENSE = "GPL"
 PR = "r1"
diff --git a/packages/puppy/puppy_1.9.bb b/packages/puppy/puppy_1.9.bb
index 173eb9185d..e6bf59f9a8 100644
--- a/packages/puppy/puppy_1.9.bb
+++ b/packages/puppy/puppy_1.9.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Interface software for the TopField TF5000PVRt"
 SECTION = "network"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 HOMEPAGE = "http://sf.net/projects/puppy/"
 LICENSE = "GPL"
 PR = "r1"
diff --git a/packages/puzz-le/puzz-le_2.0.0.bb b/packages/puzz-le/puzz-le_2.0.0.bb
index 80b2d54da0..b779717393 100644
--- a/packages/puzz-le/puzz-le_2.0.0.bb
+++ b/packages/puzz-le/puzz-le_2.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Puzz-le is a colorful arcade logic game for Qt/Embedded based Palmtop Environments."
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.warmi.net/zaurus/files/puzz-le_${PV}.tar.gz \
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb
index 94589e268c..c556e638c2 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
 PR = "r0"
 # It in fact requires these modules, but for now is using the local ones.
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
index e8395ae52f..d1b51579c6 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
 PR = "r0"
 RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb
index bd3362c730..9ea0c51450 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
 PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb
index 7104d4d28c..33d015aafc 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
 PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb
index 6ecc5f1600..3712f3239b 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
 PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb
index 4924785f1d..d547c979d4 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
 PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb
index 782f2636e6..e5a19514a9 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
 PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
index b912a079c4..c95f942189 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 PR = "r2"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb
index cdc8c60c4c..583c7825fe 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb
index 8896bc83ce..4c4ab65d99 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb
index 08b560f539..640297662f 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 HOMEPAGE = "http://www.isely.net/pvrusb2.html"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb
index 08b560f539..640297662f 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 HOMEPAGE = "http://www.isely.net/pvrusb2.html"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb
index 08b560f539..640297662f 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 HOMEPAGE = "http://www.isely.net/pvrusb2.html"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb
index ab22c521f3..0ff030a8e4 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 HOMEPAGE = "http://www.isely.net/pvrusb2.html"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom \
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb
index ab22c521f3..0ff030a8e4 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 HOMEPAGE = "http://www.isely.net/pvrusb2.html"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom \
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb
index ab22c521f3..0ff030a8e4 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
 HOMEPAGE = "http://www.isely.net/pvrusb2.html"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom \
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
index c06b34251e..5ad1f4f16b 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
@@ -3,7 +3,6 @@ AUTHOR = Mike Isely
 HOMEPAGE = "http://www.isely.net/pvrusb2.html"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
-MAINTAINER = "Frans Meulenbroeks <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 RRECOMMENDS = "kernel-module-tveeprom \
 	kernel-module-firmware-class \
diff --git a/packages/pwc/pwc_10.0.12-rc1.bb b/packages/pwc/pwc_10.0.12-rc1.bb
index 84777d4fd3..f70640c27f 100644
--- a/packages/pwc/pwc_10.0.12-rc1.bb
+++ b/packages/pwc/pwc_10.0.12-rc1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Philips USB Webcam driver for Linux that supports VGA resolution"
 HOMEPAGE = "http://www.saillard.org/linux/pwc"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/pwc/pwc_10.0.6a.bb b/packages/pwc/pwc_10.0.6a.bb
index 96092c5a93..9777a14955 100644
--- a/packages/pwc/pwc_10.0.6a.bb
+++ b/packages/pwc/pwc_10.0.6a.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Philips USB Webcam driver for Linux that supports VGA resolution"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung8888@yahoo.com>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/pwc/pwc_10.0.7a.bb b/packages/pwc/pwc_10.0.7a.bb
index f6af027f56..f5a876afc2 100644
--- a/packages/pwc/pwc_10.0.7a.bb
+++ b/packages/pwc/pwc_10.0.7a.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Philips USB Webcam driver for Linux that supports VGA resolution"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung8888@yahoo.com>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/pwc/pwc_10.0.9-rc1.bb b/packages/pwc/pwc_10.0.9-rc1.bb
index cfe2558b46..7632ba5ebd 100644
--- a/packages/pwc/pwc_10.0.9-rc1.bb
+++ b/packages/pwc/pwc_10.0.9-rc1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Philips USB Webcam driver for Linux that supports VGA resolution"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung8888@yahoo.com>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/pwlib/pwlib_1.5.2.bb b/packages/pwlib/pwlib_1.5.2.bb
index c30ba80f96..85fe0b1f3c 100644
--- a/packages/pwlib/pwlib_1.5.2.bb
+++ b/packages/pwlib/pwlib_1.5.2.bb
@@ -4,7 +4,6 @@
 
 HOMEPAGE="http://www.openh323.org/docs/PWLib/"
 DESCRIPTION="Portable Text and GUI C/C++ Class Libarary."
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
 
 SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
diff --git a/packages/pwlib/pwlib_1.6.6.4.bb b/packages/pwlib/pwlib_1.6.6.4.bb
index 2db6a53f15..aa81aa24c5 100644
--- a/packages/pwlib/pwlib_1.6.6.4.bb
+++ b/packages/pwlib/pwlib_1.6.6.4.bb
@@ -7,7 +7,6 @@ DEFAULT_PREFERENCE = "-1"
 
 HOMEPAGE="http://www.openh323.org/docs/PWLib/"
 DESCRIPTION="Portable Text and GUI C/C++ Class Libarary."
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
 
 SRC_URI="${DEBIAN_MIRROR}/main/p/${PN}/${PN}_${PV}.orig.tar.gz"
diff --git a/packages/python/python-ao_0.82.bb b/packages/python/python-ao_0.82.bb
index 368c01fd87..e83bd5de11 100644
--- a/packages/python/python-ao_0.82.bb
+++ b/packages/python/python-ao_0.82.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Python AO Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "libao"
 SRCNAME = "pyao"
 
diff --git a/packages/python/python-cairo_cvs.bb b/packages/python/python-cairo_cvs.bb
index 5e93a3019f..53cbd93030 100644
--- a/packages/python/python-cairo_cvs.bb
+++ b/packages/python/python-cairo_cvs.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python Cairo Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Sandino 'Tigrux' Flores <tigrux@ximian.com>"
 DEPENDS = "python-pygtk cairo"
 SRCNAME = "pycairo"
 PV = "0.0+cvs${SRCDATE}"
diff --git a/packages/python/python-cheetah_1.0.bb b/packages/python/python-cheetah_1.0.bb
index 08d7bd63cb..20fe083d81 100644
--- a/packages/python/python-cheetah_1.0.bb
+++ b/packages/python/python-cheetah_1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "template engine and code generation tool"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Cliff Brake <cbrake@bec-systems.com>"
 LICENSE = "MIT-like"
 RDEPENDS = ""
 SRCNAME = "Cheetah"
diff --git a/packages/python/python-constraint_0.2.3.bb b/packages/python/python-constraint_0.2.3.bb
index 472f6bce9b..51fd1e97e1 100644
--- a/packages/python/python-constraint_0.2.3.bb
+++ b/packages/python/python-constraint_0.2.3.bb
@@ -4,7 +4,6 @@ constraint propagation algorithms. So far, facilities are \
 provided to work with finite domains only."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SRCNAME = "constraint"
 
diff --git a/packages/python/python-crypto_1.9a6.bb b/packages/python/python-crypto_1.9a6.bb
index 39aafc0c6d..0a842e4688 100644
--- a/packages/python/python-crypto_1.9a6.bb
+++ b/packages/python/python-crypto_1.9a6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A collection of cryptographic algorithms and protocols"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "gmp"
 SRCNAME = "pycrypto"
 LICENSE = "python-crypto"
diff --git a/packages/python/python-dbus_0.23.bb b/packages/python/python-dbus_0.23.bb
index 56bff28849..cb208d6338 100644
--- a/packages/python/python-dbus_0.23.bb
+++ b/packages/python/python-dbus_0.23.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
 RDEPENDS = "dbus"
diff --git a/packages/python/python-dialog_2.7.bb b/packages/python/python-dialog_2.7.bb
index 401b312d76..ca7c0ff1d8 100644
--- a/packages/python/python-dialog_2.7.bb
+++ b/packages/python/python-dialog_2.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "dialog-like functionality in Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 SRCNAME = "pythondialog"
 
diff --git a/packages/python/python-egenix-mx-base_2.0.6.bb b/packages/python/python-egenix-mx-base_2.0.6.bb
index 49a61c97b0..b31cd20cad 100644
--- a/packages/python/python-egenix-mx-base_2.0.6.bb
+++ b/packages/python/python-egenix-mx-base_2.0.6.bb
@@ -3,7 +3,6 @@ tools which enhance Python's usability in many important areas such as ODBC data
 processing, date/time processing and web site programming."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "EGENIX"
 SRCNAME = "egenix-mx-base"
 PR = "r1"
diff --git a/packages/python/python-fnorb_1.3.bb b/packages/python/python-fnorb_1.3.bb
index 72077e7f80..dffe42e47f 100644
--- a/packages/python/python-fnorb_1.3.bb
+++ b/packages/python/python-fnorb_1.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Pure Python CORBA Package"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "FNORB"
 SRCNAME = "Fnorb"
 
diff --git a/packages/python/python-fpconst_0.6.0.bb b/packages/python/python-fpconst_0.6.0.bb
index df92dba6ca..8a359adb4f 100644
--- a/packages/python/python-fpconst_0.6.0.bb
+++ b/packages/python/python-fpconst_0.6.0.bb
@@ -5,7 +5,6 @@ It provides constants for Not-a-Number (NaN), Positive Infinity \
 to test for these values."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SRCNAME = "fpconst"
 
diff --git a/packages/python/python-gammu_0.13.bb b/packages/python/python-gammu_0.13.bb
index 755e3ec3fd..610263fd93 100644
--- a/packages/python/python-gammu_0.13.bb
+++ b/packages/python/python-gammu_0.13.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://cihar.com/gammu/python"
 SECTION = "devel/python"
 DEPENDS = "gammu"
 LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "ml0"
 
 SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2"
diff --git a/packages/python/python-gmpy_1.0.1.bb b/packages/python/python-gmpy_1.0.1.bb
index 477f5c6823..b216836785 100644
--- a/packages/python/python-gmpy_1.0.1.bb
+++ b/packages/python/python-gmpy_1.0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "General Multiprecision PYthon"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "gmp"
 SRCNAME = "gmpy"
diff --git a/packages/python/python-gnosis_1.1.1.bb b/packages/python/python-gnosis_1.1.1.bb
index b9b297adef..f8a26d844e 100644
--- a/packages/python/python-gnosis_1.1.1.bb
+++ b/packages/python/python-gnosis_1.1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Gnosis Utils contains several Python modules for XML processing, plus other generally useful tools"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPLv2"
 SRCNAME = "Gnosis_Utils"
 
diff --git a/packages/python/python-hmm_0.4.bb b/packages/python/python-hmm_0.4.bb
index 133c2c7d15..b5f75b42c2 100644
--- a/packages/python/python-hmm_0.4.bb
+++ b/packages/python/python-hmm_0.4.bb
@@ -3,7 +3,6 @@ Model and associated algorithms (Viterbi and Baum-Welsh). It uses Numeric \
 Python to speed up the computations."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "python-numeric"
 DEPENDS = "python-numeric"
diff --git a/packages/python/python-imdbpy_2.5.bb b/packages/python/python-imdbpy_2.5.bb
index 34e83ad5bd..b42c3c48d9 100644
--- a/packages/python/python-imdbpy_2.5.bb
+++ b/packages/python/python-imdbpy_2.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "IMDbPY is a Python package useful to retrieve and manage the data of the IMDb movie database."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SRCNAME = "IMDbPY"
 PR = "ml0"
diff --git a/packages/python/python-inotify_0.0.6.bb b/packages/python/python-inotify_0.0.6.bb
index 6b5f9fbd75..816f6e10a4 100644
--- a/packages/python/python-inotify_0.0.6.bb
+++ b/packages/python/python-inotify_0.0.6.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Python Linux Inotify Wrapper"
 SECTION = "devel/python"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.vanille.de/mirror/python-inotify-${PV}.tar.gz"
diff --git a/packages/python/python-irclib_0.4.3.bb b/packages/python/python-irclib_0.4.3.bb
index 799745652d..fc1fa3c01f 100644
--- a/packages/python/python-irclib_0.4.3.bb
+++ b/packages/python/python-irclib_0.4.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "IRC (Internet Relay Chat) Support Library"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 SRCNAME = "pyirclib"
 
diff --git a/packages/python/python-itools_0.13.0.bb b/packages/python/python-itools_0.13.0.bb
index 7a8225879c..091026c6a6 100644
--- a/packages/python/python-itools_0.13.0.bb
+++ b/packages/python/python-itools_0.13.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "itools is a python web technologies library"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 RDEPENDS = "python-core"
 SRCNAME = "itools"
diff --git a/packages/python/python-libgmail_0.0.7.bb b/packages/python/python-libgmail_0.0.7.bb
index fca95e995e..03963243c8 100644
--- a/packages/python/python-libgmail_0.0.7.bb
+++ b/packages/python/python-libgmail_0.0.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python Bindings for Google's Gmail Service"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "python-core python-netclient python-email"
 SRCNAME = "libgmail"
diff --git a/packages/python/python-libgmail_0.1.3.3.bb b/packages/python/python-libgmail_0.1.3.3.bb
index f7d91f3748..c59240e9cd 100644
--- a/packages/python/python-libgmail_0.1.3.3.bb
+++ b/packages/python/python-libgmail_0.1.3.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python Bindings for Google's Gmail Service"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "python-core python-netclient python-email python-mime python-pprint python-re python-pickle"
 SRCNAME = "libgmail"
diff --git a/packages/python/python-logilab_0.4.4.bb b/packages/python/python-logilab_0.4.4.bb
index e9c0a9b110..dd2599c720 100644
--- a/packages/python/python-logilab_0.4.4.bb
+++ b/packages/python/python-logilab_0.4.4.bb
@@ -5,7 +5,6 @@ command line argument parsing, logging, and process \
 daemonization."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SRCNAME = "common"
 
diff --git a/packages/python/python-lxml_1.0.2.bb b/packages/python/python-lxml_1.0.2.bb
index e36379fed9..de0566e38f 100644
--- a/packages/python/python-lxml_1.0.2.bb
+++ b/packages/python/python-lxml_1.0.2.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://codespeak.net/lxml/"
 AUTHOR = "http://codespeak.net/mailman/listinfo/lxml-dev"
 LICENSE = "BSD"
 DEPENDS = "libxml2 libxslt"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "ml0"
 
 SRC_URI = "http://codespeak.net/lxml/lxml-${PV}.tgz"
diff --git a/packages/python/python-m2crypto_0.13.1.bb b/packages/python/python-m2crypto_0.13.1.bb
index 1e29509ac6..009345e5a0 100644
--- a/packages/python/python-m2crypto_0.13.1.bb
+++ b/packages/python/python-m2crypto_0.13.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Python crypto and SSL toolkit"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "openssl swig-native"
 LICENSE = "BSD"
 SRCNAME = "M2Crypto"
diff --git a/packages/python/python-mad_0.5.1.bb b/packages/python/python-mad_0.5.1.bb
index 1ae8053d0a..20e3af770c 100644
--- a/packages/python/python-mad_0.5.1.bb
+++ b/packages/python/python-mad_0.5.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python libmad Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 RDEPENDS = "python-core libmad"
 DEPENDS = "libmad"
diff --git a/packages/python/python-native_2.4.0.bb b/packages/python/python-native_2.4.0.bb
index 4f5db82569..18b890203f 100644
--- a/packages/python/python-native_2.4.0.bb
+++ b/packages/python/python-native_2.4.0.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.python.org"
 LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = ""
 PR = "r1"
 
diff --git a/packages/python/python-numarray_1.1.1.bb b/packages/python/python-numarray_1.1.1.bb
index f21c377da2..c1b9340e3c 100644
--- a/packages/python/python-numarray_1.1.1.bb
+++ b/packages/python/python-numarray_1.1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Next Generation sophisticated Numeric Processing Package for Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PYRAF"
 SRCNAME = "numarray"
 
diff --git a/packages/python/python-numeric_23.7.bb b/packages/python/python-numeric_23.7.bb
index e06934ece8..bd6934d711 100644
--- a/packages/python/python-numeric_23.7.bb
+++ b/packages/python/python-numeric_23.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A sophisticated Numeric Processing Package for Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PSF"
 PR = "ml0"
 
diff --git a/packages/python/python-ogg_1.3.bb b/packages/python/python-ogg_1.3.bb
index 007408df6b..0a0e89b96e 100644
--- a/packages/python/python-ogg_1.3.bb
+++ b/packages/python/python-ogg_1.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python Ogg Vorbis Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 DEPENDS = "libogg"
 SRCNAME = "pyogg"
diff --git a/packages/python/python-pexpect_2.1.bb b/packages/python/python-pexpect_2.1.bb
index e23aaf5273..ae0fa2aabf 100644
--- a/packages/python/python-pexpect_2.1.bb
+++ b/packages/python/python-pexpect_2.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Pure Python Expect like Module for Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PSF"
 RDEPENDS = "python-core python-io python-terminal python-resource python-fcntl"
 SRCNAME = "pexpect"
diff --git a/packages/python/python-psyco_1.5.bb b/packages/python/python-psyco_1.5.bb
index b633b65061..5c47e6971d 100644
--- a/packages/python/python-psyco_1.5.bb
+++ b/packages/python/python-psyco_1.5.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Psyco lets you run your existing Python software much faster, wit
 HOMEPAGE = "http://psyco.sourceforge.net"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "dkm@kataplop.net"
 LICENSE = "PSF"
 RDEPENDS = "python-core"
 SRCNAME = "psyco"
diff --git a/packages/python/python-pybluez_0.2.bb b/packages/python/python-pybluez_0.2.bb
index aa5d4fec2b..8931afcd0c 100644
--- a/packages/python/python-pybluez_0.2.bb
+++ b/packages/python/python-pybluez_0.2.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Python bindings for the Linux Bluetooth stack"
-MAINTAINER = "Michael 'Mickey' Lauer"
 SECTION = "devel/python"
 DEPENDS = "bluez-libs"
 LICENSE = "GPL"
diff --git a/packages/python/python-pychecker_0.8.14.bb b/packages/python/python-pychecker_0.8.14.bb
index df899521f7..25ae7f0ae7 100644
--- a/packages/python/python-pychecker_0.8.14.bb
+++ b/packages/python/python-pychecker_0.8.14.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "SourceCode Test Utility"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "BSD"
 SRCNAME = "pychecker"
 
diff --git a/packages/python/python-pycodes_1.1.bb b/packages/python/python-pycodes_1.1.bb
index 1530eef44b..c44e7d7e30 100644
--- a/packages/python/python-pycodes_1.1.bb
+++ b/packages/python/python-pycodes_1.1.bb
@@ -5,7 +5,6 @@ the Internet; and even data compression. A variety of decoding/quantization algo
 things like sum-product as well as linear programming relaxations."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PYCODES"
 SRCNAME = "pycodes"
 
diff --git a/packages/python/python-pycurl_7.14.0.bb b/packages/python/python-pycurl_7.14.0.bb
index f336131a63..a9480ad949 100644
--- a/packages/python/python-pycurl_7.14.0.bb
+++ b/packages/python/python-pycurl_7.14.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "libcurl Python Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 RDEPENDS = "python-core curl (>=${PV})"
 DEPENDS = "curl-${PV}"
diff --git a/packages/python/python-pyephem_3.7b.bb b/packages/python/python-pyephem_3.7b.bb
index 10eb590cf8..5141b6e574 100644
--- a/packages/python/python-pyephem_3.7b.bb
+++ b/packages/python/python-pyephem_3.7b.bb
@@ -6,7 +6,6 @@ comets, or earth satellites whose orbital elements the user can provide."
 HOMEPAGE = "http://www.rhodesmill.org/brandon/projects/pyephem.html"
 LICENSE = "PSF"
 AUTHOR = "Brandon Craig Rhodes"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "ml0"
 
 SRC_URI = "http://www.rhodesmill.org/brandon/projects/pyephem-${PV}.tar.gz"
diff --git a/packages/python/python-pyfits_1.0.1.bb b/packages/python/python-pyfits_1.0.1.bb
index 1d1507d406..a8d336005a 100644
--- a/packages/python/python-pyfits_1.0.1.bb
+++ b/packages/python/python-pyfits_1.0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "PyFITS provides an interface to FITS formatted files under the Python scripting language."
 HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyfits"
 AUTHOR = "Space Telescope Science Institute"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de"
 RDEPENDS = "python-numarray"
 SECTION = "devel/python"
 LICENSE = "AURA"
diff --git a/packages/python/python-pyflakes_0.2.0.bb b/packages/python/python-pyflakes_0.2.0.bb
index 77fed35e7a..c78bccb589 100644
--- a/packages/python/python-pyflakes_0.2.0.bb
+++ b/packages/python/python-pyflakes_0.2.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "SourceCode Test Utility"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "BSD"
 SRCNAME = "pyflakes"
 
diff --git a/packages/python/python-pygame_1.6.bb b/packages/python/python-pygame_1.6.bb
index c07a07c75c..7d76a9ac99 100644
--- a/packages/python/python-pygame_1.6.bb
+++ b/packages/python/python-pygame_1.6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python libSDL Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 RDEPENDS = "python-core python-numeric"
 DEPENDS = "virtual/libsdl libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
diff --git a/packages/python/python-pygame_1.7.1.bb b/packages/python/python-pygame_1.7.1.bb
index d80359dbba..a664c0ea0a 100644
--- a/packages/python/python-pygame_1.7.1.bb
+++ b/packages/python/python-pygame_1.7.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python libSDL Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 RDEPENDS = "python-core python-numeric libsdl-x11"
 DEPENDS = "virtual/libsdl libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
diff --git a/packages/python/python-pygoogle_0.6.bb b/packages/python/python-pygoogle_0.6.bb
index 4b405ce26c..87e264be6b 100644
--- a/packages/python/python-pygoogle_0.6.bb
+++ b/packages/python/python-pygoogle_0.6.bb
@@ -3,7 +3,6 @@ It allows you to do Google searches, retrieve pages from the \
 Google cache, and ask Google for spelling suggestions."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PSF"
 RDEPENDS = "python-core python-soappy"
 SRCNAME = "pygoogle"
diff --git a/packages/python/python-pygtk2_2.8.6.bb b/packages/python/python-pygtk2_2.8.6.bb
index d91e13532c..55e33eab43 100644
--- a/packages/python/python-pygtk2_2.8.6.bb
+++ b/packages/python/python-pygtk2_2.8.6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python GTK+ Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "gtk+ libglade"
 RDEPENDS = "python-shell"
 SRCNAME = "pygtk"
diff --git a/packages/python/python-pygtk_0.6.12.bb b/packages/python/python-pygtk_0.6.12.bb
index d01918bf05..20504f1108 100644
--- a/packages/python/python-pygtk_0.6.12.bb
+++ b/packages/python/python-pygtk_0.6.12.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Python GTK+ 1.2 Bindings"
 HOMEPAGE = "http://www.gtk.org"
 SECTION = "devel/python"
 LICENSE = "LGPL"
-MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
 DEPENDS = "gtk+-1.2"
 RDEPENDS = "python-shell python-re"
 SRCNAME = "pygtk"
diff --git a/packages/python/python-pyid3lib_0.5.1.bb b/packages/python/python-pyid3lib_0.5.1.bb
index 65d20d49c0..0eeca38d2d 100644
--- a/packages/python/python-pyid3lib_0.5.1.bb
+++ b/packages/python/python-pyid3lib_0.5.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Python Wrapper for libid3."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Jason Haslup <openembedded@haslup.com>"
 LICENSE = "LGPL"
 DEPENDS = "id3lib"
 SRCNAME = "pyid3lib"
diff --git a/packages/python/python-pylinda_0.6.bb b/packages/python/python-pylinda_0.6.bb
index 3bcd1a1362..ef557ccca7 100644
--- a/packages/python/python-pylinda_0.6.bb
+++ b/packages/python/python-pylinda_0.6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python Implementation of Linda Tuple Space"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 SRCNAME = "linda"
 
diff --git a/packages/python/python-pylint_0.3.3.bb b/packages/python/python-pylint_0.3.3.bb
index 68b0dc8717..bd93ea4084 100644
--- a/packages/python/python-pylint_0.3.3.bb
+++ b/packages/python/python-pylint_0.3.3.bb
@@ -4,7 +4,6 @@ features, like checking line-code's length, checking if variable names are well-
 or checking if declared interfaces are truly implemented, and much more."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "python-core python-logilab"
 SRCNAME = "pylint"
diff --git a/packages/python/python-pymetar_0.11.bb b/packages/python/python-pymetar_0.11.bb
index 48b89a15e8..a73a17e516 100644
--- a/packages/python/python-pymetar_0.11.bb
+++ b/packages/python/python-pymetar_0.11.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Access NOAA's METAR weather reports"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "python-core"
 SRCNAME = "pymetar"
diff --git a/packages/python/python-pyode_1.0.0.bb b/packages/python/python-pyode_1.0.0.bb
index 2d70f848b5..f0d5c9ec6f 100644
--- a/packages/python/python-pyode_1.0.0.bb
+++ b/packages/python/python-pyode_1.0.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "PyODE is a set of open-source Python bindings for The Open Dynami
 an open-source physics engine. PyODE also includes an XODE parser."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 SRCNAME = "PyODE"
 
diff --git a/packages/python/python-pyqt4_4.0.bb b/packages/python/python-pyqt4_4.0.bb
index 7550e2314d..fad858d203 100644
--- a/packages/python/python-pyqt4_4.0.bb
+++ b/packages/python/python-pyqt4_4.0.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://riverbankcomputing.co.uk"
 AUTHOR = "Phil Thomson @ riverbank.co.uk"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "python-core"
 SRCNAME = "pyqt"
diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb
index 72efea077c..5e5f0b7256 100644
--- a/packages/python/python-pyqt_3.13.bb
+++ b/packages/python/python-pyqt_3.13.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 AUTHOR = "Phil Thomson @ riverbank.co.uk"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/libqte2 virtual/libqpe1"
 RDEPENDS = "python-core python-sip"
diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb
index 8e47c04544..6c603df852 100644
--- a/packages/python/python-pyqwt_3.10.bb
+++ b/packages/python/python-pyqwt_3.10.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Python QWT Bindings, QtE edition"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt"
 DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt"
diff --git a/packages/python/python-pyrad_0.8.bb b/packages/python/python-pyrad_0.8.bb
index c62580627d..6e5e08bb77 100644
--- a/packages/python/python-pyrad_0.8.bb
+++ b/packages/python/python-pyrad_0.8.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python Radius Client and Server"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "BSD"
 SRCNAME = "pyrad"
 
diff --git a/packages/python/python-pyraf_1.2.1.bb b/packages/python/python-pyraf_1.2.1.bb
index 2242390853..0c9f12a69e 100644
--- a/packages/python/python-pyraf_1.2.1.bb
+++ b/packages/python/python-pyraf_1.2.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "PyRAF is a Python-based interface to IRAF."
 HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyfits"
 AUTHOR = "Space Telescope Science Institute"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de"
 RDEPENDS = "python-numarray"
 SECTION = "devel/python"
 LICENSE = "AURA"
diff --git a/packages/python/python-pyreverse_0.5.0.bb b/packages/python/python-pyreverse_0.5.0.bb
index f46d0b0517..ab7322e9e8 100644
--- a/packages/python/python-pyreverse_0.5.0.bb
+++ b/packages/python/python-pyreverse_0.5.0.bb
@@ -3,7 +3,6 @@ tools, documentation generation, and XMI generation for importation in a UML mod
 used to generate files readable by Argo UML."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "python-core python-logilab python-pyxml"
 SRCNAME = "pyreverse"
diff --git a/packages/python/python-pyrex_0.9.3.bb b/packages/python/python-pyrex_0.9.3.bb
index 36b8370e60..d0a5f826e0 100644
--- a/packages/python/python-pyrex_0.9.3.bb
+++ b/packages/python/python-pyrex_0.9.3.bb
@@ -3,7 +3,6 @@ It's designed to bridge the gap between the nice, high-level, easy-to-use world
 and the messy, low-level world of C."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SRCNAME = "Pyrex"
 PR = "ml0"
diff --git a/packages/python/python-pyro_3.5.bb b/packages/python/python-pyro_3.5.bb
index bb3e96c89f..dd6e60d430 100644
--- a/packages/python/python-pyro_3.5.bb
+++ b/packages/python/python-pyro_3.5.bb
@@ -5,7 +5,6 @@ easy to use, and is small simple and free. Written by Irmen de Jong."
 HOMEPAGE = "http://pyro.sourceforge.net"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "JStauft <wikimail@telus.net>"
 LICENSE = "MIT"
 RDEPENDS = "python-core python-crypt python-io python-lang python-math \
 python-netserver python-pickle python-re python-shell python-stringold \
diff --git a/packages/python/python-pyserial_2.0.bb b/packages/python/python-pyserial_2.0.bb
index 044c666037..d7adbe947c 100644
--- a/packages/python/python-pyserial_2.0.bb
+++ b/packages/python/python-pyserial_2.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Serial Port Support for Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PSF"
 SRCNAME = "pyserial"
 RDEPENDS = "python-fcntl python-io"
diff --git a/packages/python/python-pyserial_2.2.bb b/packages/python/python-pyserial_2.2.bb
index 024f839351..a5d083c580 100644
--- a/packages/python/python-pyserial_2.2.bb
+++ b/packages/python/python-pyserial_2.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Serial Port Support for Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PSF"
 SRCNAME = "pyserial"
 RDEPENDS = "python-fcntl python-io"
diff --git a/packages/python/python-pysqlite2_2.2.2.bb b/packages/python/python-pysqlite2_2.2.2.bb
index 1f10a64226..37be3bc0ea 100644
--- a/packages/python/python-pysqlite2_2.2.2.bb
+++ b/packages/python/python-pysqlite2_2.2.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Python extension for the SQLite Embedded Relational Database"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PSF"
 RDEPENDS = "python-core python-re python-lang python-datetime"
 DEPENDS = "sqlite3"
diff --git a/packages/python/python-pysqlite_1.0.bb b/packages/python/python-pysqlite_1.0.bb
index 46ad0239ce..1c567ab6e4 100644
--- a/packages/python/python-pysqlite_1.0.bb
+++ b/packages/python/python-pysqlite_1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Python extension for the SQLite Embedded Relational Database"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PSF"
 RDEPENDS = "python-core python-re python-lang"
 DEPENDS = "sqlite"
diff --git a/packages/python/python-pytest_0.5.0.bb b/packages/python/python-pytest_0.5.0.bb
index 73a73ca005..72826593e4 100644
--- a/packages/python/python-pytest_0.5.0.bb
+++ b/packages/python/python-pytest_0.5.0.bb
@@ -3,7 +3,6 @@ by aggregating PyUnit tests and making them easier to call from the command \
 line and from within other unit tests."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SRCNAME = "pytest"
 PR = "ml0"
diff --git a/packages/python/python-pyvisa_0.9.7.bb b/packages/python/python-pyvisa_0.9.7.bb
index 54ece76300..5657c795a3 100644
--- a/packages/python/python-pyvisa_0.9.7.bb
+++ b/packages/python/python-pyvisa_0.9.7.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A Python package with bindings to the 'Virtual Instrument Softwar
 (VISA) library, in order to control measurement devices and test equipment via GPIB, RS232, or USB."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "BSD"
 SRCNAME = "PyVISA"
 
diff --git a/packages/python/python-pyweather_0.5.0.bb b/packages/python/python-pyweather_0.5.0.bb
index 7f630030d0..4a51d6eb9b 100644
--- a/packages/python/python-pyweather_0.5.0.bb
+++ b/packages/python/python-pyweather_0.5.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "PyWeather is a collection of weather related modules \
 that are capable of performing conversion calculations for many common meteorological units."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SRCNAME = "pyweather"
 PR = "ml0"
diff --git a/packages/python/python-pyxml_0.8.4.bb b/packages/python/python-pyxml_0.8.4.bb
index edf1d21542..2bfe7ebcae 100644
--- a/packages/python/python-pyxml_0.8.4.bb
+++ b/packages/python/python-pyxml_0.8.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A sophisticated XML Processing Package for Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PSF"
 RDEPENDS = "python-core python-xml python-netclient"
 SRCNAME = "pyxml"
diff --git a/packages/python/python-pyxmlrpc_0.8.8.3.bb b/packages/python/python-pyxmlrpc_0.8.8.3.bb
index 652b4cb1d3..406e9af2b0 100644
--- a/packages/python/python-pyxmlrpc_0.8.8.3.bb
+++ b/packages/python/python-pyxmlrpc_0.8.8.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Fast Python XMLRPC Library"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 RDEPENDS = "python-core"
 SRCNAME = "py-xmlrpc"
diff --git a/packages/python/python-quicklauncher_0.0.1.bb b/packages/python/python-quicklauncher_0.0.1.bb
index c675a2f0fc..33609dfe08 100644
--- a/packages/python/python-quicklauncher_0.0.1.bb
+++ b/packages/python/python-quicklauncher_0.0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A PyQt-optimized Python Quicklauncher for Qt/Embedded based Palmtop Environments"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 RDEPENDS = "python-pyqt"
 PR = "ml1"
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/pyquicklauncher"
diff --git a/packages/python/python-scapy_0.9.17.bb b/packages/python/python-scapy_0.9.17.bb
index 30b380d2f3..f9cc0eb6a1 100644
--- a/packages/python/python-scapy_0.9.17.bb
+++ b/packages/python/python-scapy_0.9.17.bb
@@ -5,7 +5,6 @@ It can for the moment replace hping, 85% of nmap, arpspoof, arp-sk, arping, \
 tcpdump, tethereal, p0f, ...."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 RDEPENDS = "python-core python-netclient python-netserver"
 SRCNAME = "scapy"
 
diff --git a/packages/python/python-scons_0.96.90.bb b/packages/python/python-scons_0.96.90.bb
index 3db28863ba..dc5b40243e 100644
--- a/packages/python/python-scons_0.96.90.bb
+++ b/packages/python/python-scons_0.96.90.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Software Construction Tool"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SRCNAME = "scons"
 
diff --git a/packages/python/python-sgmlop_1.1.bb b/packages/python/python-sgmlop_1.1.bb
index 46498959c4..7e2fc5adff 100644
--- a/packages/python/python-sgmlop_1.1.bb
+++ b/packages/python/python-sgmlop_1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Pythonware Fast SGML Parser for Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SRCNAME = "sgmlop"
 LICENSE = "python-sgmlop"
 SRC_URI = "http://www.vanille.de/mirror/${SRCNAME}-${PV}.tar.bz2"
diff --git a/packages/python/python-sip4_4.4.5.bb b/packages/python/python-sip4_4.4.5.bb
index 4bdc8ed769..000aa8b86f 100644
--- a/packages/python/python-sip4_4.4.5.bb
+++ b/packages/python/python-sip4_4.4.5.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
 AUTHOR = "Phil Thompson"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "python"
 RDEPENDS = "python-core"
diff --git a/packages/python/python-sip_4.1.1.bb b/packages/python/python-sip_4.1.1.bb
index 8fd2e08c7d..8e118ea7de 100644
--- a/packages/python/python-sip_4.1.1.bb
+++ b/packages/python/python-sip_4.1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/libqte2 python"
 RDEPENDS = "python-core"
diff --git a/packages/python/python-snmplib_0.1.1.bb b/packages/python/python-snmplib_0.1.1.bb
index ad75fbeb61..1af8ebbe51 100644
--- a/packages/python/python-snmplib_0.1.1.bb
+++ b/packages/python/python-snmplib_0.1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Pure Python SNMP Package"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 RDEPENDS = "python-core"
 SRCNAME = "libsnmp"
 LICENSE = "LGPL"
diff --git a/packages/python/python-soappy_0.11.3.bb b/packages/python/python-soappy_0.11.3.bb
index 21107933ef..6ae59ac515 100644
--- a/packages/python/python-soappy_0.11.3.bb
+++ b/packages/python/python-soappy_0.11.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python SOAP Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "BSD"
 RDEPENDS = "python-core python-xml python-fpconst"
 SRCNAME = "SOAPpy"
diff --git a/packages/python/python-spydi_0.9.3.bb b/packages/python/python-spydi_0.9.3.bb
index e20bf754de..b03d9980db 100644
--- a/packages/python/python-spydi_0.9.3.bb
+++ b/packages/python/python-spydi_0.9.3.bb
@@ -3,7 +3,6 @@ to create distributed full text indexing systems and distributed search engines.
 It supports harvesting, crawling (pull methods), and push methods (via a Web \
 interface or SPyRO Web services)."
 HOMEPAGE = "http://www.spyron.org/spydi.html"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"
diff --git a/packages/python/python-spyro_0.9.14.bb b/packages/python/python-spyro_0.9.14.bb
index 73ba6ae2a6..745bdfbc5e 100644
--- a/packages/python/python-spyro_0.9.14.bb
+++ b/packages/python/python-spyro_0.9.14.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Simplified Python Remote Objects is a multilingual object request
 SPyRO uses the most efficient (or available) connection between peers to minimize costs \
 of transport and parsing in the communication."
 HOMEPAGE = "http://www.spyron.org/"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"
diff --git a/packages/python/python-sword_1.5.8.bb b/packages/python/python-sword_1.5.8.bb
index ddbebb503a..b8e319c693 100644
--- a/packages/python/python-sword_1.5.8.bb
+++ b/packages/python/python-sword_1.5.8.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python bindings for the sword library"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Matt Reimer <mreimer@vpop.net>"
 LICENSE = "GPL"
 RDEPENDS = "python-core sword"
 DEPENDS = "sword-${PV} swig-native"
diff --git a/packages/python/python-tlslite_0.3.0.bb b/packages/python/python-tlslite_0.3.0.bb
index d121610118..f860b4b1b4 100644
--- a/packages/python/python-tlslite_0.3.0.bb
+++ b/packages/python/python-tlslite_0.3.0.bb
@@ -3,7 +3,6 @@ authentication methods such as SRP, shared keys, and cryptoIDs, in addition to X
 Python, however it can access OpenSSL or cryptlib for faster crypto operations."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PD"
 SRCNAME = "tlslite"
 
diff --git a/packages/python/python-urwid_0.8.4.bb b/packages/python/python-urwid_0.8.4.bb
index 0c0a13c52f..ca068ecf49 100644
--- a/packages/python/python-urwid_0.8.4.bb
+++ b/packages/python/python-urwid_0.8.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Python Widget library based on python-curses."
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 RDEPENDS = "python-core python-curses"
 SRCNAME = "urwid"
diff --git a/packages/python/python-vmaps_1.1.bb b/packages/python/python-vmaps_1.1.bb
index 8faf1de55c..3cbdec4245 100644
--- a/packages/python/python-vmaps_1.1.bb
+++ b/packages/python/python-vmaps_1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python Arrays on mmap()"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SRCNAME = "vmaps"
 
diff --git a/packages/python/python-vorbis_1.3.bb b/packages/python/python-vorbis_1.3.bb
index 97ddf8caf5..7e839d1af4 100644
--- a/packages/python/python-vorbis_1.3.bb
+++ b/packages/python/python-vorbis_1.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python Vorbis Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 RDEPENDS = "python-core libvorbis python-ogg"
 DEPENDS = "libvorbis python-ogg"
diff --git a/packages/python/python-webpy_0.138.bb b/packages/python/python-webpy_0.138.bb
index f7c8aa821c..a6a36faedc 100644
--- a/packages/python/python-webpy_0.138.bb
+++ b/packages/python/python-webpy_0.138.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Lightweight Web Application Framework"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PSF"
 RDEPENDS = "python-netserver python-netclient python-pprint"
 
diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb
index 2af6789b7a..1380c2e40f 100644
--- a/packages/python/python_2.4.3.bb
+++ b/packages/python/python_2.4.3.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.python.org"
 LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
 PR = "ml6"
diff --git a/packages/qc-usb/qc-usb-messenger_0.8.bb b/packages/qc-usb/qc-usb-messenger_0.8.bb
index 0f5279311b..3353af97f7 100644
--- a/packages/qc-usb/qc-usb-messenger_0.8.bb
+++ b/packages/qc-usb/qc-usb-messenger_0.8.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/qc-usb/qc-usb-messenger_1.1.bb b/packages/qc-usb/qc-usb-messenger_1.1.bb
index ebd2ac9798..311f572f0f 100644
--- a/packages/qc-usb/qc-usb-messenger_1.1.bb
+++ b/packages/qc-usb/qc-usb-messenger_1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/qclockchange/qclockchange_0.1a.bb b/packages/qclockchange/qclockchange_0.1a.bb
index 331b20d00e..c04da5335a 100644
--- a/packages/qclockchange/qclockchange_0.1a.bb
+++ b/packages/qclockchange/qclockchange_0.1a.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Program that allows you to set the CCCR registers on PXA Zauruses
 SECTION = "opie/settings"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Dylan Taft <soundmanok@yahoo.com>"
 AUTHOR = "piro <piro400@occn.zaq.ne.jp>"
 HOMEPAGE = "http://www.piro.hopto.org/~piro/pukiwiki/pukiwiki.php?%5B%5B%A5%AB%A1%BC%A5%CD%A5%EB%A5%D1%A5%C3%A5%C1%A4%F2%A4%DE%A4%C8%A4%E1%A4%EB%5D%5D"
 APPTYPE="binary"
diff --git a/packages/qfish/qfish2_1.1.0.bb b/packages/qfish/qfish2_1.1.0.bb
index 2822d622f3..ad2182371b 100644
--- a/packages/qfish/qfish2_1.1.0.bb
+++ b/packages/qfish/qfish2_1.1.0.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "A Game with fishes, Qt/Embedded based Palmtop Environments Edition"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "opie/games"
 LICENSE = "GPL"
 PRIORITY = "optional"
diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb
index 2a4408ad2a..a5c164c08a 100644
--- a/packages/qmake/qmake-native_1.07a.bb
+++ b/packages/qmake/qmake-native_1.07a.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "TrollTech Makefile Generator"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "devel"
 LICENSE = "GPL QPL"
 PR = "r3"
diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb
index 9f1af8fef2..5b30fa07bc 100644
--- a/packages/qmake/qmake2-native_2.00a.bb
+++ b/packages/qmake/qmake2-native_2.00a.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "TrollTech Makefile Generator"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "devel"
 LICENSE = "GPL QPL"
 PR = "r1"
diff --git a/packages/qmatrix/qmatrix_1.1.0.bb b/packages/qmatrix/qmatrix_1.1.0.bb
index 84ed03d43c..a47d00fa56 100644
--- a/packages/qmatrix/qmatrix_1.1.0.bb
+++ b/packages/qmatrix/qmatrix_1.1.0.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "A matrix Game, Qt/Embedded based Palmtop Environments Edition"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "opie/games"
 LICENSE = "GPL"
 PRIORITY = "optional"
diff --git a/packages/qolyester/qolyester_20050728.bb b/packages/qolyester/qolyester_20050728.bb
index 9f80f3d6cb..e57fa6efb2 100644
--- a/packages/qolyester/qolyester_20050728.bb
+++ b/packages/qolyester/qolyester_20050728.bb
@@ -3,7 +3,6 @@ SECTION = "net"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://qolsr.lri.fr"
-MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
 PR = "r0"
 
 SRC_URI = "http://qolsr.lri.fr/code/qolyester-${PV}.tar.bz2"
diff --git a/packages/qpe-gaim/qpe-gaim_20041030.bb b/packages/qpe-gaim/qpe-gaim_20041030.bb
index 3e7cff0a2f..f8f4d6a28f 100644
--- a/packages/qpe-gaim/qpe-gaim_20041030.bb
+++ b/packages/qpe-gaim/qpe-gaim_20041030.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "A multi protocol instant messager application, Qt/Embedded based Palmtop Environments Edition"
 SECTION = "opie/applications"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "qpe-libgaim glib-2.0"
 RDEPENDS = "libgaim-plugins glibc-gconv-iso8859-1"
 LICENSE = "GPL"
diff --git a/packages/qpe-gaim/qpe-libgaim_1.5.0.bb b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb
index 58fc4b93b5..ab756470cc 100644
--- a/packages/qpe-gaim/qpe-libgaim_1.5.0.bb
+++ b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "A multi protocol instant messager library, Qt/Embedded based Palmtop Environments Edition"
 SECTION = "opie/applications"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "glib-2.0 gnutls"
 RDEPENDS = "libgaim-plugins"
 LICENSE = "GPL"
diff --git a/packages/qpe-games/aliens-qt_1.0.0.bb b/packages/qpe-games/aliens-qt_1.0.0.bb
index b31007987b..9ee17f935b 100644
--- a/packages/qpe-games/aliens-qt_1.0.0.bb
+++ b/packages/qpe-games/aliens-qt_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Alien ShootOut"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Bill Kendrick"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Aliens.html"
diff --git a/packages/qpe-games/atomic_1.0.1.bb b/packages/qpe-games/atomic_1.0.1.bb
index cdb5dfe4ba..4b6910544b 100644
--- a/packages/qpe-games/atomic_1.0.1.bb
+++ b/packages/qpe-games/atomic_1.0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Atomic"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 
 LICENSE = "GPL"
 AUTHOR = "Andre Wuest"
diff --git a/packages/qpe-games/checkers_1.0.5ern.bb b/packages/qpe-games/checkers_1.0.5ern.bb
index 3f22d09939..d27b5f9832 100644
--- a/packages/qpe-games/checkers_1.0.5ern.bb
+++ b/packages/qpe-games/checkers_1.0.5ern.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Checkers"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Walter Rawdanik"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Checkers.html"
diff --git a/packages/qpe-games/crossword_0.0.3.bb b/packages/qpe-games/crossword_0.0.3.bb
index d257a75ac9..74adbf68b7 100644
--- a/packages/qpe-games/crossword_0.0.3.bb
+++ b/packages/qpe-games/crossword_0.0.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Checkers"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Robert Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Crossword.html"
diff --git a/packages/qpe-games/fish_1.1.0.bb b/packages/qpe-games/fish_1.1.0.bb
index 5034ab3803..74990e824a 100644
--- a/packages/qpe-games/fish_1.1.0.bb
+++ b/packages/qpe-games/fish_1.1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Fish Amusement"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Robert Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Fish.html"
diff --git a/packages/qpe-games/glider_1.0.0.bb b/packages/qpe-games/glider_1.0.0.bb
index ab5addfa5f..e2cbe15c65 100644
--- a/packages/qpe-games/glider_1.0.0.bb
+++ b/packages/qpe-games/glider_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Glider"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Robert Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Glider.html"
diff --git a/packages/qpe-games/hexatrolic_1.0beta3.bb b/packages/qpe-games/hexatrolic_1.0beta3.bb
index c1528165ce..123810cfef 100644
--- a/packages/qpe-games/hexatrolic_1.0beta3.bb
+++ b/packages/qpe-games/hexatrolic_1.0beta3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Hexatrolic a Ball Game"
 SECTION     = "opie/games"
 PRIORITY    = "optional"
-MAINTAINER  = "none"
 LICENSE     = "GPL"
 AUTHOR      = "Helge Plehn"
 HOMEPAGE    = "http://hexatrolic.i-networx.de/"
diff --git a/packages/qpe-games/icebloxx_1.0.0.bb b/packages/qpe-games/icebloxx_1.0.0.bb
index e1a842375a..8c88eb0f74 100644
--- a/packages/qpe-games/icebloxx_1.0.0.bb
+++ b/packages/qpe-games/icebloxx_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "IceBloxx"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Robert Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-IceBloxx.html"
diff --git a/packages/qpe-games/labyrinth_0.7.bb b/packages/qpe-games/labyrinth_0.7.bb
index e7468b507b..9075b010eb 100644
--- a/packages/qpe-games/labyrinth_0.7.bb
+++ b/packages/qpe-games/labyrinth_0.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A traditional (german?) boardgame"
 SECTION     = "opie/games"
 PRIORITY    = "optional"
-MAINTAINER  = "none"
 LICENSE     = "GPL"
 AUTHOR      = "Helge Plehn"
 HOMEPAGE    = "http://hexatrolic.i-networx.de/"
diff --git a/packages/qpe-games/mahjongg_1.0.0.bb b/packages/qpe-games/mahjongg_1.0.0.bb
index 1deff98a6f..50dd78ba76 100644
--- a/packages/qpe-games/mahjongg_1.0.0.bb
+++ b/packages/qpe-games/mahjongg_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Mahjongg"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Mario Weilguni, Port by Rober Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Mahjongg.html"
diff --git a/packages/qpe-games/maki_1.0.4ern.bb b/packages/qpe-games/maki_1.0.4ern.bb
index 5e99fbffae..3d72ea9742 100644
--- a/packages/qpe-games/maki_1.0.4ern.bb
+++ b/packages/qpe-games/maki_1.0.4ern.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Maki"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Henry So, Jr."
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Maki.html"
diff --git a/packages/qpe-games/nmm_0.0.2.bb b/packages/qpe-games/nmm_0.0.2.bb
index 41f0be5c9d..7a37244d24 100644
--- a/packages/qpe-games/nmm_0.0.2.bb
+++ b/packages/qpe-games/nmm_0.0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Nime Mens Morris"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Dirk Farin, Port by Rober Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Nine-Mens-Morris.html"
diff --git a/packages/qpe-games/pairs_1.1.1.bb b/packages/qpe-games/pairs_1.1.1.bb
index 275251db28..28ccf9bebf 100644
--- a/packages/qpe-games/pairs_1.1.1.bb
+++ b/packages/qpe-games/pairs_1.1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Pairs"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Rober Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Pairs.html"
diff --git a/packages/qpe-games/pdamaze_1.0.0.bb b/packages/qpe-games/pdamaze_1.0.0.bb
index 2074eac3e5..ffc847413c 100644
--- a/packages/qpe-games/pdamaze_1.0.0.bb
+++ b/packages/qpe-games/pdamaze_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "PDA-Maze"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Bill Kendrick, Port by Rober Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-PDA-Maze.html"
diff --git a/packages/qpe-games/pipeman_1.0.0.bb b/packages/qpe-games/pipeman_1.0.0.bb
index 9fe156695e..b0d661eae6 100644
--- a/packages/qpe-games/pipeman_1.0.0.bb
+++ b/packages/qpe-games/pipeman_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Pipeman"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Rober Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-PDA-Pipeman.html"
diff --git a/packages/qpe-games/shisensho_1.0.0.bb b/packages/qpe-games/shisensho_1.0.0.bb
index b33bdc3805..70cd759942 100644
--- a/packages/qpe-games/shisensho_1.0.0.bb
+++ b/packages/qpe-games/shisensho_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Shisensho"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Mario Weilguni"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Shisen-Sho.html"
diff --git a/packages/qpe-games/sokoban_1.3.8ern.bb b/packages/qpe-games/sokoban_1.3.8ern.bb
index 70bb5442ab..a8fe6c6226 100644
--- a/packages/qpe-games/sokoban_1.3.8ern.bb
+++ b/packages/qpe-games/sokoban_1.3.8ern.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Pairs"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Anders Widell, Steve Dunham, Robert Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Sokoban.html"
diff --git a/packages/qpe-games/tron_1.0.0.bb b/packages/qpe-games/tron_1.0.0.bb
index 22387000c6..2438fa8d45 100644
--- a/packages/qpe-games/tron_1.0.0.bb
+++ b/packages/qpe-games/tron_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Tron"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Matthias Kiefer"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Tron.html"
diff --git a/packages/qpe-games/win4_1.0.1.bb b/packages/qpe-games/win4_1.0.1.bb
index 05e4a68e5b..d7573691f6 100644
--- a/packages/qpe-games/win4_1.0.1.bb
+++ b/packages/qpe-games/win4_1.0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "4 wins"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Anders Widell, Steve Dunham, Robert Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Win4.html"
diff --git a/packages/qpe-games/ziq_1.1ern.bb b/packages/qpe-games/ziq_1.1ern.bb
index 37c9e790f8..626f03d53d 100644
--- a/packages/qpe-games/ziq_1.1ern.bb
+++ b/packages/qpe-games/ziq_1.1ern.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "ZIQ"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Bill Wetter"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZIQ.html"
diff --git a/packages/qpe-games/zsubhunt_1.0.0ern.bb b/packages/qpe-games/zsubhunt_1.0.0ern.bb
index 29446b5b4d..d486058bab 100644
--- a/packages/qpe-games/zsubhunt_1.0.0ern.bb
+++ b/packages/qpe-games/zsubhunt_1.0.0ern.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Sub Marine Hunt"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Kart Bartel, Robert Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZSubhunt.html"
diff --git a/packages/qpe-games/ztappy_0.9.3ern.bb b/packages/qpe-games/ztappy_0.9.3ern.bb
index c7e816bea9..1fe3c5187a 100644
--- a/packages/qpe-games/ztappy_0.9.3ern.bb
+++ b/packages/qpe-games/ztappy_0.9.3ern.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "ZTappy"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Kart Bartel, Robert Ernst"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZTappy.html"
diff --git a/packages/qpe-inputhelper/qpe-inputhelper-applet_1.0.0.bb b/packages/qpe-inputhelper/qpe-inputhelper-applet_1.0.0.bb
index 34447f7819..7660549051 100644
--- a/packages/qpe-inputhelper/qpe-inputhelper-applet_1.0.0.bb
+++ b/packages/qpe-inputhelper/qpe-inputhelper-applet_1.0.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Qtopia/Opie Input helper for USB devices"
 SECTION = "opie/inputmethods"
 HOMEPAGE = "http://tbox.jpn.org/wiki/linuzau/wiki.cgi"
 LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 APPNAME = "qpeinputhelper"
 
diff --git a/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb b/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb
index 57475a3d53..0748e58915 100644
--- a/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb
+++ b/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Vexed levels for qpe-vexed"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "The Vexed Development Team"
 HOMEPAGE = "http://vexed.sourceforge.net/"
diff --git a/packages/qpe-vexed/qpe-vexed_1.3.bb b/packages/qpe-vexed/qpe-vexed_1.3.bb
index f33fbe484e..b38cf5b954 100644
--- a/packages/qpe-vexed/qpe-vexed_1.3.bb
+++ b/packages/qpe-vexed/qpe-vexed_1.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Vexed clone"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Alexander Hausner <Alexander.Hausner@web.de>"
 HOMEPAGE = "http://wwwcip.informatik.uni-erlangen.de/~sialhaus/qpe-vexed.html"
diff --git a/packages/qpealarmclock/qpealarmclock_1.0.9.bb b/packages/qpealarmclock/qpealarmclock_1.0.9.bb
index 597c43fbb0..4a9cb988ad 100644
--- a/packages/qpealarmclock/qpealarmclock_1.0.9.bb
+++ b/packages/qpealarmclock/qpealarmclock_1.0.9.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Alarm Clock"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Patrik Gfeller (gfellerpatrik@gmx.net)"
 LICENSE = "GPL"
 AUTHOR = "Dafydd Walters & Anton Maslovsky"
 HOMEPAGE = "http://my-zaurus.narod.ru/"
diff --git a/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb
index 33dabde5e9..a964f1feec 100644
--- a/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb
+++ b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Alarm Clock Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
-MAINTAINER = "Patrik Gfeller (gfellerpatrik@gmx.net)"
 LICENSE = "GPL"
 AUTHOR = "Anton Maslovsky"
 HOMEPAGE = "http://my-zaurus.narod.ru/"
diff --git a/packages/qpegps/qpegps_0.9.2.3.3.bb b/packages/qpegps/qpegps_0.9.2.3.3.bb
index d93ee529b8..7eaa456d74 100644
--- a/packages/qpegps/qpegps_0.9.2.3.3.bb
+++ b/packages/qpegps/qpegps_0.9.2.3.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A GPS navigation application for the Opie environment."
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 RRECOMMENDS = "gpsd"
 LICENSE = "GPL"
 HOMEPAGE = "http://qpegps.sourceforge.net/"
diff --git a/packages/qpenmapfe/qpenmapfe_1.0.0.bb b/packages/qpenmapfe/qpenmapfe_1.0.0.bb
index e90c20e1a0..a99ec2559a 100644
--- a/packages/qpenmapfe/qpenmapfe_1.0.0.bb
+++ b/packages/qpenmapfe/qpenmapfe_1.0.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A frontend for the nmap port scanner, Qt/Embedded based Palmtop E
 SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 AUTHOR = "Dennis Webb"
 APPNAME = "qpenmapfe"
 APPTYPE = "binary"
diff --git a/packages/qpf-fonts/qpf-arabic_1.0.bb b/packages/qpf-fonts/qpf-arabic_1.0.bb
index bbe45ab90d..5198829604 100644
--- a/packages/qpf-fonts/qpf-arabic_1.0.bb
+++ b/packages/qpf-fonts/qpf-arabic_1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Arabic fonts from Arabeyes.org"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "Abdulhaq <abdulhaq@users.sourceforge.net>"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.arabeyes.org"
 PR = "r0"
diff --git a/packages/qpf-fonts/qpf-dejavu.inc b/packages/qpf-fonts/qpf-dejavu.inc
index a2ef48161d..b3625bfb60 100644
--- a/packages/qpf-fonts/qpf-dejavu.inc
+++ b/packages/qpf-fonts/qpf-dejavu.inc
@@ -1,6 +1,5 @@
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "Bitstream Vera"
 HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page"
 PACKAGE_ARCH = "all"
diff --git a/packages/qpf-fonts/qpf-font-common_1.0.bb b/packages/qpf-fonts/qpf-font-common_1.0.bb
index aaea74ec6c..306fa22201 100644
--- a/packages/qpf-fonts/qpf-font-common_1.0.bb
+++ b/packages/qpf-fonts/qpf-font-common_1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Qt/Embedded Fonts Common Files"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL QPL"
 PR = "r2"
 
diff --git a/packages/qpf-fonts/qpf-freemono_1.0.bb b/packages/qpf-fonts/qpf-freemono_1.0.bb
index 642e942dd9..aebe58337f 100644
--- a/packages/qpf-fonts/qpf-freemono_1.0.bb
+++ b/packages/qpf-fonts/qpf-freemono_1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "FreeMono font - QPF Edition"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 HOMEPAGE = "http://savannah.nongnu.org/projects/freefont/"
 PACKAGE_ARCH = "all"
diff --git a/packages/qpf-fonts/qpf-freeserif_1.0.bb b/packages/qpf-fonts/qpf-freeserif_1.0.bb
index 51010df359..3044981176 100644
--- a/packages/qpf-fonts/qpf-freeserif_1.0.bb
+++ b/packages/qpf-fonts/qpf-freeserif_1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "FreeSerif font - QPF Edition"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 HOMEPAGE = "http://savannah.nongnu.org/projects/freefont/"
 PACKAGE_ARCH = "all"
diff --git a/packages/qpf-fonts/qpf-helvetica_1.0.bb b/packages/qpf-fonts/qpf-helvetica_1.0.bb
index d04207c1fd..bd44bb60a0 100644
--- a/packages/qpf-fonts/qpf-helvetica_1.0.bb
+++ b/packages/qpf-fonts/qpf-helvetica_1.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Helvetica fonts - QPF Edition"
 LICENSE = "GPL QPL"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html"
 PR = "r1"
 
diff --git a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
index 79de04ea1f..aa0804cadd 100644
--- a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
+++ b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Hunky Sans font - QPF Edition"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.yoper.com/ariszlo/hunky.html http://sourceforge.net/projects/hunkyfonts"
 PACKAGE_ARCH = "all"
diff --git a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
index 34acde69d2..861690ee0f 100644
--- a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
+++ b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Hunky Serif font - QPF Edition"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.yoper.com/ariszlo/hunky.html http://sourceforge.net/projects/hunkyfonts"
 PACKAGE_ARCH = "all"
diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb
index 5e5462a964..33e7d87e32 100644
--- a/packages/qpf-fonts/qpf-qte_2.3.10.bb
+++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Qt/Embedded Fonts Version ${PV}"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL QPL"
 HOMEPAGE = "http://www.trolltech.com"
 PR = "r1"
diff --git a/packages/qpf-fonts/qpf-unismall_1.0.0.bb b/packages/qpf-fonts/qpf-unismall_1.0.0.bb
index ba79c83c95..8b9dd5dbd6 100644
--- a/packages/qpf-fonts/qpf-unismall_1.0.0.bb
+++ b/packages/qpf-fonts/qpf-unismall_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Lightweight Japanese font in 10 point suitable for 320x240 display"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "Rolf Leggewie <openembedded-unismall@rolf.leggewie.biz>"
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.jp/projects/zaurus-ja/"
 RPROVIDES = "virtual/japanese-font"
diff --git a/packages/qpf-fonts/qpf-utopia_1.0.bb b/packages/qpf-fonts/qpf-utopia_1.0.bb
index 5ce0c06296..d1fff823fe 100644
--- a/packages/qpf-fonts/qpf-utopia_1.0.bb
+++ b/packages/qpf-fonts/qpf-utopia_1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Utopia fonts - QPF Edition"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL QPL"
 HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html"
 PACKAGE_ARCH = "all"
diff --git a/packages/qpf-fonts/terminus.bb b/packages/qpf-fonts/terminus.bb
index 462794384d..102759e8b9 100644
--- a/packages/qpf-fonts/terminus.bb
+++ b/packages/qpf-fonts/terminus.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Qt/Embedded terminus font"
 HOMEPAGE = "http://www.is-vn.bg/hamster/jimmy-en.html"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
-MAINTAINER = "M&N Solutions GmbH <info@mn-solutions.de>"
 LICENSE = "GPL"
 PACKAGE_ARCH = "all"
 PR = "r2"
diff --git a/packages/qplot/qplot_2.0.1+cvs20020420.bb b/packages/qplot/qplot_2.0.1+cvs20020420.bb
index b78afd9a76..a3965b9e3b 100644
--- a/packages/qplot/qplot_2.0.1+cvs20020420.bb
+++ b/packages/qplot/qplot_2.0.1+cvs20020420.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "QPlot is an Advanced Matematical Calculator for Qt/Embedded based Palmtop Environments"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://qplot.sourceforge.net/"
 SRCDATE = 20020420
diff --git a/packages/qscintilla/qscintilla_1.60-gpl-1.3.bb b/packages/qscintilla/qscintilla_1.60-gpl-1.3.bb
index aff9c5b9cf..a983e7f1b4 100644
--- a/packages/qscintilla/qscintilla_1.60-gpl-1.3.bb
+++ b/packages/qscintilla/qscintilla_1.60-gpl-1.3.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Qt/Embedded bindings for the Scintilla source code editor component"
 SECTION = "opie/libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/qscintilla/qscintilla_1.60-gpl-1.3b.bb b/packages/qscintilla/qscintilla_1.60-gpl-1.3b.bb
index 297f504dbd..afcd3041d0 100644
--- a/packages/qscintilla/qscintilla_1.60-gpl-1.3b.bb
+++ b/packages/qscintilla/qscintilla_1.60-gpl-1.3b.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Qt/Embedded bindings for the Scintilla source code editor component"
 SECTION = "opie/libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb
index 1620ef62c5..3acb29e3fa 100644
--- a/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb
+++ b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Qt/Embedded bindings for the Scintilla source code editor component"
 SECTION = "opie/libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/qsvn/qsvn_0.3.0.bb b/packages/qsvn/qsvn_0.3.0.bb
index 6c77c63c61..13653ea898 100644
--- a/packages/qsvn/qsvn_0.3.0.bb
+++ b/packages/qsvn/qsvn_0.3.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "QSvn is a graphical Subversion client for Linux, UNIX, Mac OS X a
 It is written in C++ using the Qt4 toolkit from Trolltech."
 HOMEPAGE = "http://ar.oszine.de/projects/qsvn/"
 AUTHOR = "Andreas Richter, Rajko Albrecht"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SECTION = "network"
 DEPENDS = "apr-util subversion"
diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb
index b246e9ebcf..f7acbec82f 100644
--- a/packages/qt/qt-x11-free_3.3.6.bb
+++ b/packages/qt/qt-x11-free_3.3.6.bb
@@ -3,7 +3,6 @@ SECTION = "x11/libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
 HOMEPAGE = "http://www.trolltech.com"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql"
 PROVIDES = "qt3x11"
 PR = "r0"
diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb
index cd0f90becd..60f7f3fa66 100644
--- a/packages/qt/qt4-x11-free_4.1.2.bb
+++ b/packages/qt/qt4-x11-free_4.1.2.bb
@@ -3,7 +3,6 @@ SECTION = "x11/libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/libx11 xft libxext libxrender libxrandr libxcursor"
 PROVIDES = "qt4x11"
 PR = "r1"
diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb
index 5215a3e258..479ed55bb8 100644
--- a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb
+++ b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb
@@ -1,5 +1,4 @@
 DESCRIPTION= "Tools to update the Qt fontdir"
-MAINTAINER = "M&N Solutions <info@mn-solutions.de>"
 SECTION = "opie/base"
 LICENSE = "GPL QPL"
 PACKAGE_ARCH = "all"
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index a1ea049737..3ea3c0d02d 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "Qt/Embedded Version ${PV}"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
diff --git a/packages/quagga/quagga.inc b/packages/quagga/quagga.inc
index 2c3d79074b..b67e913253 100644
--- a/packages/quagga/quagga.inc
+++ b/packages/quagga/quagga.inc
@@ -6,7 +6,6 @@ Ishiguro. The Quagga tree aims to build a more involved community \
 around Quagga than the current centralised model of GNU Zebra."
 HOMEPAGE = "http://www.quagga.net/"
 SECTION = "network"
-MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "GPL"
 DEPENDS = "readline ncurses perl-native"
 # Each of the per-protocol packages depends on the main package
diff --git a/packages/quake/quake1_0.0.1.bb b/packages/quake/quake1_0.0.1.bb
index d4aea8fadf..9cd3be9d36 100644
--- a/packages/quake/quake1_0.0.1.bb
+++ b/packages/quake/quake1_0.0.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Quake 1"
 SECTION = "x11/games"
 PRIORITY = "optional"
 DEPENDS = "libsdl-x11 libsdl-mixer libsdl-net zlib libxau"
-MAINTAINER = "Simon Pickering <S.G.Pickering@bath.ac.uk>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/quilt/quilt.inc b/packages/quilt/quilt.inc
index 387ec8f057..b1d19daf45 100644
--- a/packages/quilt/quilt.inc
+++ b/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/packages/qwt/qwt_4.2.0rc1.bb b/packages/qwt/qwt_4.2.0rc1.bb
index f2cbe7d37f..31f3daaaa2 100644
--- a/packages/qwt/qwt_4.2.0rc1.bb
+++ b/packages/qwt/qwt_4.2.0rc1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Qt Widget Extension for Technical Applications"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/libqte2"
 PR = "r2"
diff --git a/packages/radlib/radlib-common.inc b/packages/radlib/radlib-common.inc
index ba0f6db019..bb289bf74a 100644
--- a/packages/radlib/radlib-common.inc
+++ b/packages/radlib/radlib-common.inc
@@ -1,7 +1,6 @@
 SECTION = "libs"
 LICENSE = "BSD"
 DESCRIPTION = "radlib is a rapid application development library for unix interprocess communications, sockets, SHA utilities, CRC utilities and much more."
-MAINTAINER = "Mark Teel (mark@teel.ws)"
 HOMEPAGE = "http://www.radlib.teel.ws/"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/radlib/radlib-${PV}.tar.gz \
diff --git a/packages/randrext/randrext_1.0.bb b/packages/randrext/randrext_1.0.bb
index 4a8607c691..3fe6a442ac 100644
--- a/packages/randrext/randrext_1.0.bb
+++ b/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/packages/randrext/randrext_cvs.bb b/packages/randrext/randrext_cvs.bb
index a16139b539..29cff38373 100644
--- a/packages/randrext/randrext_cvs.bb
+++ b/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/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb
index 315dd87ebe..7581647a57 100644
--- a/packages/rdesktop/rdesktop_1.4.1.bb
+++ b/packages/rdesktop/rdesktop_1.4.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Rdesktop rdp client for X"
 DEPENDS = "virtual/libx11 openssl"
 HOMEPAGE = "http://www.rdesktop.org"
 SECTION = "x11/network"
-MAINTAINER = "Adrian Davey <ade@beth2.org>"
 LICENSE = "GPL"
 PV = "1.4.1"
 PR = "r1"
diff --git a/packages/rdesktop/rdesktop_1.5.0.bb b/packages/rdesktop/rdesktop_1.5.0.bb
index 3ccdbac353..de270e1025 100644
--- a/packages/rdesktop/rdesktop_1.5.0.bb
+++ b/packages/rdesktop/rdesktop_1.5.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Rdesktop rdp client for X"
 DEPENDS = "virtual/libx11 openssl"
 HOMEPAGE = "http://www.rdesktop.org"
 SECTION = "x11/network"
-MAINTAINER = "Adrian Davey <ade@beth2.org>"
 LICENSE = "GPL"
 PV = "1.5.0"
 PR = "r0"
diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb
index 089cf0468d..5ec0527e16 100644
--- a/packages/rdesktop/rdesktop_cvs.bb
+++ b/packages/rdesktop/rdesktop_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Rdesktop rdp client for X"
 DEPENDS = "virtual/libx11 openssl"
 HOMEPAGE = "http://www.rdesktop.org"
 SECTION = "x11/network"
-MAINTAINER = "Adrian Davey <ade@beth2.org>"
 LICENSE = "GPL"
 PV = "1.5.0+cvs${SRCDATE}"
 PR = "r3"
diff --git a/packages/recordext/recordext_cvs.bb b/packages/recordext/recordext_cvs.bb
index 494b53acdd..eeaae24762 100644
--- a/packages/recordext/recordext_cvs.bb
+++ b/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/packages/reiser4progs/reiser4progs_1.0.4.bb b/packages/reiser4progs/reiser4progs_1.0.4.bb
index 07f5e68a09..8185b8df89 100644
--- a/packages/reiser4progs/reiser4progs_1.0.4.bb
+++ b/packages/reiser4progs/reiser4progs_1.0.4.bb
@@ -4,7 +4,6 @@
 PR = "r1"
 DESCRIPTION = "User-level tools for Reiser4 filesystems"
 HOMEPAGE = "http://www.namesys.com"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "base"
 LICENSE = "GPL-2"
 
diff --git a/packages/renderext/renderext_0.8.bb b/packages/renderext/renderext_0.8.bb
index f1996a3fd3..a12f7c0da5 100644
--- a/packages/renderext/renderext_0.8.bb
+++ b/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/packages/renderext/renderext_cvs.bb b/packages/renderext/renderext_cvs.bb
index af84c6f8ee..08053d95b9 100644
--- a/packages/renderext/renderext_cvs.bb
+++ b/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/packages/resourceext/resourceext_1.0.bb b/packages/resourceext/resourceext_1.0.bb
index 6ba9ae2cd4..55780b1d22 100644
--- a/packages/resourceext/resourceext_1.0.bb
+++ b/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/packages/resourceext/resourceext_cvs.bb b/packages/resourceext/resourceext_cvs.bb
index 92ac8d75b0..b0fe23392e 100644
--- a/packages/resourceext/resourceext_cvs.bb
+++ b/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/packages/rng-tools/rng-tools_2.bb b/packages/rng-tools/rng-tools_2.bb
index 4b527d901b..083490a42a 100644
--- a/packages/rng-tools/rng-tools_2.bb
+++ b/packages/rng-tools/rng-tools_2.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Random number generator daemon"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
 PR = "1"
 
diff --git a/packages/roadster/roadster_cvs.bb b/packages/roadster/roadster_cvs.bb
index d339503b8d..ae32f204a2 100644
--- a/packages/roadster/roadster_cvs.bb
+++ b/packages/roadster/roadster_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Roadster aims to be easy-to-use and open-source mapping software.
 LICENSE = "GPL"
 HOMEPAGE = "http://linuxadvocate.org/projects/roadster/"
 SECTION = "x11/navigation"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = "0.0+cvs${SRCDATE}"
 PR = "r1"
 
diff --git a/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb b/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb
index f9b99278cf..3932bd5f98 100644
--- a/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb
+++ b/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb
@@ -3,7 +3,6 @@ SECTION = "games"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.artsoft.org/rocksndiamonds/"
 AUTHOR = "Holger Schemel <info@artsoft.org>"
-MAINTAINER = "Paul Sokolovsky <pmiscml@gmail.com>"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/rott/rott_1.0.bb b/packages/rott/rott_1.0.bb
index 5453001ed0..e1fc4e6a74 100644
--- a/packages/rott/rott_1.0.bb
+++ b/packages/rott/rott_1.0.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Rise of the Triad - an SDL based Doom clone - QtE based Palmtop Environments Edition"
 HOMEPAGE = "http://www.icculus.org/root"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/rp-pppoe/rp-pppoe_3.5.bb b/packages/rp-pppoe/rp-pppoe_3.5.bb
index dd7f87bd15..b238962be5 100644
--- a/packages/rp-pppoe/rp-pppoe_3.5.bb
+++ b/packages/rp-pppoe/rp-pppoe_3.5.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
 HOMEPAGE="http://www.roaringpenguin.com/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE="GPLv2"
 
 SRC_URI="http://www.roaringpenguin.com/penguin/pppoe/${P}.tar.gz \
diff --git a/packages/rpm/rpm_4.4.bb b/packages/rpm/rpm_4.4.bb
index ca60056c9c..ff69ddc50f 100644
--- a/packages/rpm/rpm_4.4.bb
+++ b/packages/rpm/rpm_4.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "The RPM Package Manager."
 HOMEPAGE = "http://rpm.org/"
 LICENSE = "LGPL GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 # NOTE: currently rpm doesn't support using an external popt,
 # file, or virtual/db.  FIXME: patch it to support that.
 # DEPENDS = "virtual/db popt file zlib"
diff --git a/packages/rrdtool/rrdtool_1.0.49.bb b/packages/rrdtool/rrdtool_1.0.49.bb
index ab482b1131..7eecbd4468 100644
--- a/packages/rrdtool/rrdtool_1.0.49.bb
+++ b/packages/rrdtool/rrdtool_1.0.49.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "RRD is the Acronym for Round Robin Database. RRD is a system to store and display time-series data (i.e. network bandwidth, machine-room temperature, server load average)."
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 HOMEPAGE = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool"
 LICENSE = "GPLv2"
 DEPENDS = "libpng zlib"
diff --git a/packages/rtaudio/librtaudio_3.0.1.bb b/packages/rtaudio/librtaudio_3.0.1.bb
index 62ed46860b..9549076ee5 100644
--- a/packages/rtaudio/librtaudio_3.0.1.bb
+++ b/packages/rtaudio/librtaudio_3.0.1.bb
@@ -4,7 +4,6 @@ Macintosh OS X, SGI, and Windows (DirectSound and ASIO) operating systems."
 SECTION = "libs"
 LICENSE = "rtaudio"
 HOMEPAGE = "http://www.music.mcgill.ca/~gary/rtaudio"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "alsa-lib"
 PR = "r0"
 
diff --git a/packages/ruby/ruby_1.8.3.bb b/packages/ruby/ruby_1.8.3.bb
index 235c3892de..981f826dc6 100644
--- a/packages/ruby/ruby_1.8.3.bb
+++ b/packages/ruby/ruby_1.8.3.bb
@@ -3,7 +3,6 @@ for quick and easy object-oriented programming."
 SECTION = "devel/ruby"
 DEPENDS = "ruby-native"
 PRIORITY = "optional"
-MAINTAINER = "Gints Polis <gints.polis@cc.lv>"
 LICENSE = "GPL"
 
 SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz"
diff --git a/packages/ruby/ruby_1.8.4.bb b/packages/ruby/ruby_1.8.4.bb
index 235c3892de..981f826dc6 100644
--- a/packages/ruby/ruby_1.8.4.bb
+++ b/packages/ruby/ruby_1.8.4.bb
@@ -3,7 +3,6 @@ for quick and easy object-oriented programming."
 SECTION = "devel/ruby"
 DEPENDS = "ruby-native"
 PRIORITY = "optional"
-MAINTAINER = "Gints Polis <gints.polis@cc.lv>"
 LICENSE = "GPL"
 
 SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz"
diff --git a/packages/ruby/ruby_1.8.5.bb b/packages/ruby/ruby_1.8.5.bb
index 235c3892de..981f826dc6 100644
--- a/packages/ruby/ruby_1.8.5.bb
+++ b/packages/ruby/ruby_1.8.5.bb
@@ -3,7 +3,6 @@ for quick and easy object-oriented programming."
 SECTION = "devel/ruby"
 DEPENDS = "ruby-native"
 PRIORITY = "optional"
-MAINTAINER = "Gints Polis <gints.polis@cc.lv>"
 LICENSE = "GPL"
 
 SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz"
diff --git a/packages/sablevm/sablevm-classpath_1.1.9.bb b/packages/sablevm/sablevm-classpath_1.1.9.bb
index 1c1c3a11ce..cda269c70a 100644
--- a/packages/sablevm/sablevm-classpath_1.1.9.bb
+++ b/packages/sablevm/sablevm-classpath_1.1.9.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU Classpath modified to work with SableVM"
 HOMEPAGE = "http://sablevm.org"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 PR = "r1"
 
diff --git a/packages/sablevm/sablevm-classpath_1.11.3.bb b/packages/sablevm/sablevm-classpath_1.11.3.bb
index ee6c58138c..90de4e3ac8 100644
--- a/packages/sablevm/sablevm-classpath_1.11.3.bb
+++ b/packages/sablevm/sablevm-classpath_1.11.3.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU Classpath modified to work with SableVM"
 HOMEPAGE = "http://sablevm.org"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
diff --git a/packages/sablevm/sablevm-classpath_1.12.bb b/packages/sablevm/sablevm-classpath_1.12.bb
index ee6c58138c..90de4e3ac8 100644
--- a/packages/sablevm/sablevm-classpath_1.12.bb
+++ b/packages/sablevm/sablevm-classpath_1.12.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "GNU Classpath modified to work with SableVM"
 HOMEPAGE = "http://sablevm.org"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
diff --git a/packages/sablevm/sablevm_1.1.9.bb b/packages/sablevm/sablevm_1.1.9.bb
index ee4d86d8cf..cbecd1d25a 100644
--- a/packages/sablevm/sablevm_1.1.9.bb
+++ b/packages/sablevm/sablevm_1.1.9.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A highly-portable Java virtual machine implementing the Java virt
 HOMEPAGE = "http://sablevm.org"
 LICENSE = "LGPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "interpreters"
 PR = "r1"
 
diff --git a/packages/sablevm/sablevm_1.11.3.bb b/packages/sablevm/sablevm_1.11.3.bb
index 1cc65d6b3a..35dce88d9c 100644
--- a/packages/sablevm/sablevm_1.11.3.bb
+++ b/packages/sablevm/sablevm_1.11.3.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A highly-portable Java virtual machine implementing the Java virt
 HOMEPAGE = "http://sablevm.org"
 LICENSE = "LGPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "interpreters"
 
 DEPENDS = "libffi libtool popt \
diff --git a/packages/sablevm/sablevm_1.12.bb b/packages/sablevm/sablevm_1.12.bb
index 030d8022ad..1c62842efb 100644
--- a/packages/sablevm/sablevm_1.12.bb
+++ b/packages/sablevm/sablevm_1.12.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A highly-portable Java virtual machine implementing the Java virt
 HOMEPAGE = "http://sablevm.org"
 LICENSE = "LGPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "interpreters"
 
 DEPENDS = "libffi libtool popt \
diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index b5995c1b2e..1f38f131e2 100644
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DEPENDS = readline
 LICENSE = "GPL"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 
 PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc"
 FILES_cifs = "${bindir}/mount.cifs"
diff --git a/packages/sane-backends/sane-backends_1.0.15.bb b/packages/sane-backends/sane-backends_1.0.15.bb
index 653c3fe505..b8f552891a 100644
--- a/packages/sane-backends/sane-backends_1.0.15.bb
+++ b/packages/sane-backends/sane-backends_1.0.15.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 DESCRIPTION = "Scanner drivers for SANE"
 PR = "r4"
 DEPENDS = "gphoto2 jpeg libusb"
diff --git a/packages/sbagen/sbagen_1.4.1.bb b/packages/sbagen/sbagen_1.4.1.bb
index 7c8604cb13..41918485ed 100644
--- a/packages/sbagen/sbagen_1.4.1.bb
+++ b/packages/sbagen/sbagen_1.4.1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Binaural tone generation tool."
 HOMEPAGE = "http://uazu.net/sbagen/"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "tremor"
 
diff --git a/packages/schroedinger/schroedinger_0.2.0.0.bb b/packages/schroedinger/schroedinger_0.2.0.0.bb
index 3dcc82bdff..f593047ff9 100644
--- a/packages/schroedinger/schroedinger_0.2.0.0.bb
+++ b/packages/schroedinger/schroedinger_0.2.0.0.bb
@@ -1,7 +1,6 @@
 HOMEPAGE = "http://schrodinger.sourceforge.net/
 LICENSE = "MPL/GPL/LGPL and MIT" 
 DEPENDS = "liboil gstreamer gst-plugins-base"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/schrodinger/${P}.tar.gz"
 
diff --git a/packages/scsi-idle/scsi-idle_2.4.23.bb b/packages/scsi-idle/scsi-idle_2.4.23.bb
index d18615164f..38cd739e9d 100644
--- a/packages/scsi-idle/scsi-idle_2.4.23.bb
+++ b/packages/scsi-idle/scsi-idle_2.4.23.bb
@@ -6,7 +6,6 @@ commands to the SCSI hardware."
 SECTION = "console/utils"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://packages.debian.org/unstable/admin/scsi-idle"
-MAINTAINER = "Robert Demski <Robert.Demski@wp.pl>"
 AUTHOR = "Eduard Bloch <blade@debian.org>"
 PR = "r1"
 
diff --git a/packages/scw/scw_0.4.2.bb b/packages/scw/scw_0.4.2.bb
index 84a672a12b..68d18ecb6c 100644
--- a/packages/scw/scw_0.4.2.bb
+++ b/packages/scw/scw_0.4.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Scw is a widget set specifically designed for chat programs."
 HOMEPAGE = "http://corrie.scp.fi/users/kalle.vahlman/scw/"
 LICENSE = "LGPL"
 DEPENDS = "gtk+"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 
 SRC_URI = "http://corrie.scp.fi/users/kalle.vahlman/scw/${P}.tar.gz"
diff --git a/packages/setmixer/setmixer_27DEC94.bb b/packages/setmixer/setmixer_27DEC94.bb
index d56e5d0b8e..25a07ce8ab 100644
--- a/packages/setmixer/setmixer_27DEC94.bb
+++ b/packages/setmixer/setmixer_27DEC94.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A text mode OSS soundmixer"
 LICENSE = "GPL"
 SECTION = "console/utils"
 PRIORITY = "optional"
-MAINTAINER = "Holger Schurig <no@spam.de>"
 SRC_URI = "${DEBIAN_MIRROR}/main/s/setmixer/setmixer_${PV}.orig.tar.gz \
 	   file://setmixer.patch;patch=1"
 SRC_URI_append_mnci = " file://devfs.patch;patch=1"
diff --git a/packages/setpwc/setpwc_0.9.bb b/packages/setpwc/setpwc_0.9.bb
index 67904daf95..79e24794d2 100644
--- a/packages/setpwc/setpwc_0.9.bb
+++ b/packages/setpwc/setpwc_0.9.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Set various aspects of Philips (and compatible) WebCams."
 SECTION = "console"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 HOMEPAGE = "http://www.vanheusden.com/setpwc/"
 LICENSE = "GPL"
 PR = "r1"
diff --git a/packages/setpwc/setpwc_1.1.bb b/packages/setpwc/setpwc_1.1.bb
index 120ba463bf..76b2ac6f82 100644
--- a/packages/setpwc/setpwc_1.1.bb
+++ b/packages/setpwc/setpwc_1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Set various aspects of Philips (and compatible) WebCams."
 SECTION = "console"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 HOMEPAGE = "http://www.vanheusden.com/setpwc/"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
index fb886a2b97..701915dbe3 100644
--- a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the SHARP CG-AG06 digital compact flash camera for linux ${PV}"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "CLOSED"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
 PR = "r4"
diff --git a/packages/sharp-binary-only/sharp-compat-libs_0.5.bb b/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
index ace6789343..538d25e80d 100644
--- a/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
+++ b/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
@@ -7,7 +7,6 @@ DEPENDS = "opie-sh"
 RDEPENDS = "opie-sh"
 RPROVIDES = "oz-compat"
 RCONFLICTS = "oz-compat"
-MAINTAINER = "Tim Ansell <mithro AT mithis.net>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support.bb b/packages/sharp-binary-only/sharp-sdmmc-support.bb
index 6072c94e33..2ac73c6042 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for the SHARP Zaurus SD/MMC Slot for linux ${PV}"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "CLOSED"
 RDEPENDS = "kernel (${PV})"
 PR = "r23"
diff --git a/packages/shfs/shfs-modules_0.35.bb b/packages/shfs/shfs-modules_0.35.bb
index 12c9a62779..5151e25aef 100644
--- a/packages/shfs/shfs-modules_0.35.bb
+++ b/packages/shfs/shfs-modules_0.35.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A simple and easy to use Linux kernel (2.4+) module which allows
 It supports some nice features like number of different caches for access speedup, target system optimisations, etc."
 SECTION = "kernel/modules"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r3"
 
diff --git a/packages/shfs/shfs-utils_0.35.bb b/packages/shfs/shfs-utils_0.35.bb
index 73aa089c17..8c7e05c0e5 100644
--- a/packages/shfs/shfs-utils_0.35.bb
+++ b/packages/shfs/shfs-utils_0.35.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A simple and easy to use Linux kernel (2.4+) module which allows
 It supports some nice features like number of different caches for access speedup, target system optimisations, etc."
 SECTION = "kernel/userland"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "shfs-modules (${PV})"
 DEPENDS = "virtual/kernel"
diff --git a/packages/shopper/shopper_1.2.1.bb b/packages/shopper/shopper_1.2.1.bb
index 66cdf197f2..8f6eab40e1 100644
--- a/packages/shopper/shopper_1.2.1.bb
+++ b/packages/shopper/shopper_1.2.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Shopping list manager"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "David Greaves <arbor@users.sourceforge.net>"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/zaurus-shopper/Shopper-${PV}.tar.gz \
diff --git a/packages/shorewall/shorewall_2.0.9.bb b/packages/shorewall/shorewall_2.0.9.bb
index 537a5ea3fa..ff92ac458e 100644
--- a/packages/shorewall/shorewall_2.0.9.bb
+++ b/packages/shorewall/shorewall_2.0.9.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Shorewall is a high-level tool for configuring Netfilter."
 HOMEPAGE = "http://www.shorewall.net/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 SECTION = "network"
 PRIORITY = "optional"
diff --git a/packages/sidplayer/sidplayer_1.5.0.bb b/packages/sidplayer/sidplayer_1.5.0.bb
index 5b2172269d..d41282942a 100644
--- a/packages/sidplayer/sidplayer_1.5.0.bb
+++ b/packages/sidplayer/sidplayer_1.5.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A SID Player for the Qt/Embedded based Palmtop Environments"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://sidplayer.sourceforge.net/"
 DEPENDS = "libsidplay"
diff --git a/packages/simpad-utilities/simpad-utilities.bb b/packages/simpad-utilities/simpad-utilities.bb
index e587a840b6..572098a0ad 100644
--- a/packages/simpad-utilities/simpad-utilities.bb
+++ b/packages/simpad-utilities/simpad-utilities.bb
@@ -2,5 +2,4 @@ SECTION = "console/utils"
 DESCRIPTION = "Console utilities for building the OpenSIMpad linux distribution"
 HOMEPAGE = "http://opensimpad.org"
 DEPENDS = "pad-native genboot-native serload-native"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "MIT"
\ No newline at end of file
diff --git a/packages/sip/sip-native_3.10.1.bb b/packages/sip/sip-native_3.10.1.bb
index 1f59d20601..3702799319 100644
--- a/packages/sip/sip-native_3.10.1.bb
+++ b/packages/sip/sip-native_3.10.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "SIP - A Python Wrapper Generator"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz"
diff --git a/packages/sip/sip-native_4.0.1.bb b/packages/sip/sip-native_4.0.1.bb
index 06984e00c7..e833a31871 100644
--- a/packages/sip/sip-native_4.0.1.bb
+++ b/packages/sip/sip-native_4.0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "SIP - A Python Wrapper Generator"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz"
diff --git a/packages/sip/sip4-native_4.4.5.bb b/packages/sip/sip4-native_4.4.5.bb
index f7858a3b79..3f83e6e792 100644
--- a/packages/sip/sip4-native_4.4.5.bb
+++ b/packages/sip/sip4-native_4.4.5.bb
@@ -3,7 +3,6 @@ SECTION = "base"
 HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
 AUTHOR = "Phil Thompson"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
diff --git a/packages/skippy/skippy-xd_0.5.0.bb b/packages/skippy/skippy-xd_0.5.0.bb
index 167310d4ec..5dfcf0db75 100644
--- a/packages/skippy/skippy-xd_0.5.0.bb
+++ b/packages/skippy/skippy-xd_0.5.0.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPLV2"
 DESCRIPTION = "Skippy is a full-screen task-switcher for X11."
 SECTION = "x11"
-MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 DEPENDS = "virtual/xserver libxdamage libxcomposite"
 
 inherit pkgconfig
diff --git a/packages/slang/slang_1.4.9.bb b/packages/slang/slang_1.4.9.bb
index 7f2b57e5ff..5cb3629cf9 100644
--- a/packages/slang/slang_1.4.9.bb
+++ b/packages/slang/slang_1.4.9.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "slang is a library of text functions used in editors like slrn etc."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Graeme Gregory <xora@lordpain.uklinux.net>"
 PR = "r1"
 LICENSE = "GPL Artistic"
 SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v1.4/slang-${PV}.tar.bz2 \
diff --git a/packages/sliderulez/sliderulez_0.92.bb b/packages/sliderulez/sliderulez_0.92.bb
index e9bb9e096b..e35e765310 100644
--- a/packages/sliderulez/sliderulez_0.92.bb
+++ b/packages/sliderulez/sliderulez_0.92.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gelhaus.net/cgi-bin/showpage.py?zaurus/+sliderulez.html"
 AUTHOR = "Matthew Gelhaus"
 SECTION = "opie/applications"
 LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 
 APPTYPE = "binary"
diff --git a/packages/slrn/slrn_0.9.8.0.bb b/packages/slrn/slrn_0.9.8.0.bb
index 8adc26c76d..b491023112 100644
--- a/packages/slrn/slrn_0.9.8.0.bb
+++ b/packages/slrn/slrn_0.9.8.0.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "slrn - console news reader"
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "Graeme Gregory <xora@lordpain.uklinux.net>"
 DEPENDS = "slang"
 PR = "r1"
 
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index 9bcc692fe7..6bf48e4017 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -3,7 +3,6 @@ SECTION = "console/utils"
 LICENSE = "BSD"
 DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
 flash images for the Linksys NSLU2 device. It also has jffs2 support"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 PR = "r4"
 
 RDEPENDS = "perl"
diff --git a/packages/slugtool/slugtool.bb b/packages/slugtool/slugtool.bb
index 302d4a3b27..fb7497931f 100644
--- a/packages/slugtool/slugtool.bb
+++ b/packages/slugtool/slugtool.bb
@@ -1,7 +1,6 @@
 SECTION = "unknown"
 DESCRIPTION = "Slugtool is a small app to disassemble and reassemble \
 flash images for the Linksys NSLU2 device."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PR = "r1"
 LICENSE = "GPL"
 SRC_URI = "http://www.lantz.com/filemgmt_data/files/slugtool.tar.gz \
diff --git a/packages/slutils/slutils_0.1.0.bb b/packages/slutils/slutils_0.1.0.bb
index cdb2996986..67d760cecb 100644
--- a/packages/slutils/slutils_0.1.0.bb
+++ b/packages/slutils/slutils_0.1.0.bb
@@ -4,7 +4,6 @@ DESCRIPTION_slbl = "A command-line utility to control the BackLight on Linux 2.4
 DESCRIPTION_sltime = "A ustility to save and restore the time on Sharp Linux based Zaurii"
 SECTION = "console/utils"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r4"
 
diff --git a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
index 8950810290..fdd9419bc4 100644
--- a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
+++ b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "SMPEG is a general purpose MPEG video/audio \
 player for Linux based on the mpeg_play and SPLAY MPEG decoders."
 LICENSE = "LGPL"
 SECTION = "libs/multimedia"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "virtual/libsdl"
 PROVIDES = "smpeg"
 
diff --git a/packages/sofia-sip/sofia-sip_1.11.7.bb b/packages/sofia-sip/sofia-sip_1.11.7.bb
index c9afd0de6a..357a097b0f 100644
--- a/packages/sofia-sip/sofia-sip_1.11.7.bb
+++ b/packages/sofia-sip/sofia-sip_1.11.7.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
 HOMEPAGE = "http://sofia-sip.sourceforge.net/"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE = "LGPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
diff --git a/packages/soundtracker/soundtracker-gtk2_0.6.7.bb b/packages/soundtracker/soundtracker-gtk2_0.6.7.bb
index e5131e904a..a71abda875 100644
--- a/packages/soundtracker/soundtracker-gtk2_0.6.7.bb
+++ b/packages/soundtracker/soundtracker-gtk2_0.6.7.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Music composition program in the style of AMIGA Impulse Tracker"
 DEPENDS = "gtk+ libgnomeui audiofile esound-gpe alsa-lib"
 LICENSE = "GPL"
 SECTION = "x11/multimedia"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r1"
 
 SRC_URI = "http://mutab0r.chat.ru/soundtracker-0.6.7.gtk2.tar.bz2"
diff --git a/packages/soundtracker/soundtracker_0.6.8.bb b/packages/soundtracker/soundtracker_0.6.8.bb
index b228c03c88..a1afe70f29 100644
--- a/packages/soundtracker/soundtracker_0.6.8.bb
+++ b/packages/soundtracker/soundtracker_0.6.8.bb
@@ -1,12 +1,10 @@
 DESCRIPTION = "Music composition program in the style of AMIGA Impulse Tracker"
 HOMEPAGE = "http://www.soundtracker.org"
 DEPENDS = "gtk+-1.2"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 SECTION = "x11/multimedia"
 PR = "r0"
 
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "http://www.soundtracker.org/dl/v0.6/soundtracker-${PV}.tar.gz"
 
diff --git a/packages/sparse/sparse_snapshot.bb b/packages/sparse/sparse_snapshot.bb
index 9e17dbc151..6a913d69ec 100644
--- a/packages/sparse/sparse_snapshot.bb
+++ b/packages/sparse/sparse_snapshot.bb
@@ -12,7 +12,6 @@ def get_snapshot_date(d):
 DESCRIPTION = "Sparse is a semantic parser of source files: it's neither a \
 compiler (although it could be used as a front-end for one) nor is it a \
 preprocessor (although it contains as a part of it a preprocessing phase)."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PV = "0.0+${SRCDATE}"
 LICENSE = "OSL"
 SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/sparse/sparse-${@get_snapshot_date(d)}.tar.gz \
diff --git a/packages/spca5xx/spca5xx_20050419.bb b/packages/spca5xx/spca5xx_20050419.bb
index 0e19c3ca67..f5c2821c9a 100644
--- a/packages/spca5xx/spca5xx_20050419.bb
+++ b/packages/spca5xx/spca5xx_20050419.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "USB Webcam driver for spca5xx chipset family supporting \
 over 100 models of camera""
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung8888@yahoo.com>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/spca5xx/spca5xx_20060202.bb b/packages/spca5xx/spca5xx_20060202.bb
index a5798f5b59..b0fcb0f95e 100644
--- a/packages/spca5xx/spca5xx_20060202.bb
+++ b/packages/spca5xx/spca5xx_20060202.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "USB Webcam driver for spca5xx chipset family supporting \
 over 100 models of camera""
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "dyoung <dyoung8888@yahoo.com>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/squashfs-tools/squashfs-tools_2.0r2.bb b/packages/squashfs-tools/squashfs-tools_2.0r2.bb
index ccc6b33697..25be0837d2 100644
--- a/packages/squashfs-tools/squashfs-tools_2.0r2.bb
+++ b/packages/squashfs-tools/squashfs-tools_2.0r2.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "lzma"
 SECTION = "base"
 LICENSE = "GPLv2"
diff --git a/packages/squashfs-tools/squashfs-tools_2.2r2.bb b/packages/squashfs-tools/squashfs-tools_2.2r2.bb
index 640433fcba..af1cc17e4f 100644
--- a/packages/squashfs-tools/squashfs-tools_2.2r2.bb
+++ b/packages/squashfs-tools/squashfs-tools_2.2r2.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "lzma"
 SECTION = "base"
 LICENSE = "GPLv2"
diff --git a/packages/squeak/squeak-nox_3.4-2.bb b/packages/squeak/squeak-nox_3.4-2.bb
index 02c3520c09..a11af9bb36 100644
--- a/packages/squeak/squeak-nox_3.4-2.bb
+++ b/packages/squeak/squeak-nox_3.4-2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Squeak VM for QtEmbedded"
 SECTION = "devel"
 PRIORITY = "optional"
-MAINTAINER = "Torsten Sadowski <tsadowski@gmx.net>"
 LICENSE = "Squeak License"
 HOMEPAGE = "http://www.squeak.org"
 DEPENDS = "virtual/libqpe"
diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb
index 00228790a1..a177f91ac3 100644
--- a/packages/ssmtp/ssmtp_2.61.bb
+++ b/packages/ssmtp/ssmtp_2.61.bb
@@ -1,5 +1,4 @@
 SECTION = "console/network"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 DEPENDS = "openssl"
 DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub."
 LICENSE = "GPL"
diff --git a/packages/starling/starling_0.1.bb b/packages/starling/starling_0.1.bb
index 4e19678506..edd78558c3 100644
--- a/packages/starling/starling_0.1.bb
+++ b/packages/starling/starling_0.1.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 SECTION = "gpe/multimedia"
 PRIORITY = "optional"
 PR = "r1"
-MAINTAINER = "Florian Boor <fb@kernelconcepts.de>
 
 inherit gpe autotools
 
diff --git a/packages/startup-monitor/startup-monitor_0.18-2.bb b/packages/startup-monitor/startup-monitor_0.18-2.bb
index efb2b69ad7..1d93789adf 100644
--- a/packages/startup-monitor/startup-monitor_0.18-2.bb
+++ b/packages/startup-monitor/startup-monitor_0.18-2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Startup notification support"
 LICENSE = "GPL"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 DEPENDS = "virtual/libx11 startup-notification glib-2.0 libmatchbox"
 
 inherit gpe pkgconfig 
diff --git a/packages/startup-notification/startup-notification_0.5.bb b/packages/startup-notification/startup-notification_0.5.bb
index e53ac16fa2..42a3f13735 100644
--- a/packages/startup-notification/startup-notification_0.5.bb
+++ b/packages/startup-notification/startup-notification_0.5.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Startup notification support"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "virtual/libx11"
 
 inherit autotools pkgconfig 
diff --git a/packages/startup-notification/startup-notification_0.8.bb b/packages/startup-notification/startup-notification_0.8.bb
index 0cf4f089cc..bccabba5ec 100644
--- a/packages/startup-notification/startup-notification_0.8.bb
+++ b/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 = "virtual/libx11"
 
 inherit autotools pkgconfig 
diff --git a/packages/stat/stat_3.3.bb b/packages/stat/stat_3.3.bb
index 073aacd458..85da8fc779 100644
--- a/packages/stat/stat_3.3.bb
+++ b/packages/stat/stat_3.3.bb
@@ -1,7 +1,6 @@
 SECTION = "console/utils"
 DESCRIPTION = "Display all information about a file that the stat() call provides and all information a filesystem that statfs() provides."
 LICENSE = "GPL"
-MAINTAINER = "Holger Schurig <hs4388@mn-solutions.de>"
 
 SRC_URI = "ftp://metalab.unc.edu/pub/Linux/utils/file/stat-3.3.tar.gz"
 
diff --git a/packages/streamripper/streamripper_1.61.10.bb b/packages/streamripper/streamripper_1.61.10.bb
index 465e3d457d..fe691400ac 100644
--- a/packages/streamripper/streamripper_1.61.10.bb
+++ b/packages/streamripper/streamripper_1.61.10.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "StreamRipper lets you record streaming mp3 to your hard drive."
 SECTION = "console/multimedia"
 LICENSE = "GPL"
-STREAMRIPPER_MAINTAINER= "Inge Arnesen <inge.arnesen@gmail.com>"
 DEPENDS= "libogg libvorbis"
 RDEPENDS= "libogg libvorbis"
 
diff --git a/packages/stress/stress_0.18.8.bb b/packages/stress/stress_0.18.8.bb
index 7999a3c0ee..58812c95db 100644
--- a/packages/stress/stress_0.18.8.bb
+++ b/packages/stress/stress_0.18.8.bb
@@ -4,7 +4,6 @@
 
 HOMEPAGE="http://weather.ou.edu/~apw/projects/stress/"
 DESCRIPTION = "a simple tool that imposes certain types of compute stress on UNIX-like operating systems."
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE = "GPL"
 
 inherit autotools
diff --git a/packages/subapplet/subapplet_1.0.8.bb b/packages/subapplet/subapplet_1.0.8.bb
index ed2614f0c7..3ef8091435 100644
--- a/packages/subapplet/subapplet_1.0.8.bb
+++ b/packages/subapplet/subapplet_1.0.8.bb
@@ -4,7 +4,6 @@ in the normal taskbar."
 SECTION = "opie/applets"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 HOMEPAGE = "http://sourceforge.net/projects/subapplet/"
 PR = "r5"
 
diff --git a/packages/subversion/subversion_1.3.1.bb b/packages/subversion/subversion_1.3.1.bb
index ac537cf310..fb9ecf4d45 100644
--- a/packages/subversion/subversion_1.3.1.bb
+++ b/packages/subversion/subversion_1.3.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "The Subversion (svn) client"
 SECTION = "console/network"
 DEPENDS = "apr-util-0.9.12 neon"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "Apache/BSD"
 HOMEPAGE = "http://subversion.tigris.org"
 PR = "r1"
diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb
index f508381d15..26fc1ff4a7 100644
--- a/packages/subversion/subversion_1.4.0.bb
+++ b/packages/subversion/subversion_1.4.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "The Subversion (svn) client"
 SECTION = "console/network"
 DEPENDS = "apr-util-0.9.12 neon"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "Apache/BSD"
 HOMEPAGE = "http://subversion.tigris.org"
 PR = "r0"
diff --git a/packages/supertux/supertux_0.1.2.bb b/packages/supertux/supertux_0.1.2.bb
index d319dfb80e..2a8797634e 100644
--- a/packages/supertux/supertux_0.1.2.bb
+++ b/packages/supertux/supertux_0.1.2.bb
@@ -3,7 +3,6 @@ in a style similar to the original SuperMario games."
 SECTION = "games"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl libsdl-mixer libsdl-image"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/suspend-desktop/suspend-desktop_1.0.bb b/packages/suspend-desktop/suspend-desktop_1.0.bb
index 5ad9ec9478..0d67fc30d3 100644
--- a/packages/suspend-desktop/suspend-desktop_1.0.bb
+++ b/packages/suspend-desktop/suspend-desktop_1.0.bb
@@ -2,7 +2,6 @@ PR          = "r1"
 SECTION     = "gpe"
 PRIORITY    = "optional"
 DESCRIPTION = "Suspend feature for the application launcher menu."
-MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 LICENSE     = "GPL"
 DEPENDS     = "gpe-conf"
 RDEPENDS    = "gpe-conf"
diff --git a/packages/sylpheed/sylpheed-claws-extra-plugins.inc b/packages/sylpheed/sylpheed-claws-extra-plugins.inc
index e3b7a9e388..93596ab4d8 100644
--- a/packages/sylpheed/sylpheed-claws-extra-plugins.inc
+++ b/packages/sylpheed/sylpheed-claws-extra-plugins.inc
@@ -1,7 +1,6 @@
 SECTION = "x11/network"
 DESCRIPTION = "Mail user agent plugins"
 DEPENDS = "sylpheed-claws"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/sylpheed/sylpheed-claws_2.3.1.bb b/packages/sylpheed/sylpheed-claws_2.3.1.bb
index 0308e60964..e6231fcc75 100644
--- a/packages/sylpheed/sylpheed-claws_2.3.1.bb
+++ b/packages/sylpheed/sylpheed-claws_2.3.1.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/network"
 DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/sylpheed/sylpheed-claws_2.4.0.bb b/packages/sylpheed/sylpheed-claws_2.4.0.bb
index 0308e60964..e6231fcc75 100644
--- a/packages/sylpheed/sylpheed-claws_2.4.0.bb
+++ b/packages/sylpheed/sylpheed-claws_2.4.0.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/network"
 DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/sylpheed/sylpheed_2.2.7.bb b/packages/sylpheed/sylpheed_2.2.7.bb
index 3ea47c44dd..6223624fc5 100644
--- a/packages/sylpheed/sylpheed_2.2.7.bb
+++ b/packages/sylpheed/sylpheed_2.2.7.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/network"
 DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ gpgme gnutls"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/synergy/synergy_1.2.7.bb b/packages/synergy/synergy_1.2.7.bb
index 3303cc7000..d5dd98e1fc 100644
--- a/packages/synergy/synergy_1.2.7.bb
+++ b/packages/synergy/synergy_1.2.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Synergy - control multiple computers with one keyboard and mouse"
 HOMEPAGE = "http://synergy2.sourceforge.net/"
 LICENSE = "GPLv2"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "x11/utils"
 # NOTE: This depends on full x11, not diet-x11
 DEPENDS = "libx11 libxtst"
diff --git a/packages/syslinux/syslinux-native_2.11.bb b/packages/syslinux/syslinux-native_2.11.bb
index 9fc02b0a49..fd92b92dc1 100644
--- a/packages/syslinux/syslinux-native_2.11.bb
+++ b/packages/syslinux/syslinux-native_2.11.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION="A multi-purpose linux bootloader"
 HOMEPAGE="http://syslinux.zytor.com/"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE="GPL"
 
 PR="r1"
diff --git a/packages/syslinux/syslinux-native_3.11.bb b/packages/syslinux/syslinux-native_3.11.bb
index f74e0ca677..a61d3a28e9 100644
--- a/packages/syslinux/syslinux-native_3.11.bb
+++ b/packages/syslinux/syslinux-native_3.11.bb
@@ -4,7 +4,6 @@
 
 DESCRIPTION="A multi-purpose linux bootloader"
 HOMEPAGE="http://syslinux.zytor.com/"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE="GPL"
 
 PR="r1"
diff --git a/packages/syslog-ng/syslog-ng_1.6.11.bb b/packages/syslog-ng/syslog-ng_1.6.11.bb
index 0eea18d4e9..07e9ed14df 100644
--- a/packages/syslog-ng/syslog-ng_1.6.11.bb
+++ b/packages/syslog-ng/syslog-ng_1.6.11.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Alternative system logger daemon"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 DEPENDS = "libol flex"
 PR = "r0"
 
diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb
index ce1f77813c..af7a9b4502 100644
--- a/packages/syslog-ng/syslog-ng_1.6.8.bb
+++ b/packages/syslog-ng/syslog-ng_1.6.8.bb
@@ -1,5 +1,4 @@
 PR = "r9"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol flex"
 
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index 4b8518f37e..40f0840374 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/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 = "r28"
 
diff --git a/packages/t1lib/t1lib_5.0.2.bb b/packages/t1lib/t1lib_5.0.2.bb
index f9a29b2723..3934016c1e 100644
--- a/packages/t1lib/t1lib_5.0.2.bb
+++ b/packages/t1lib/t1lib_5.0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Type1 Font Rastering Library"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r3"
 LICENSE = "LGPL GPL"
 SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \
diff --git a/packages/tapioca/libjingle-tapioca_svn.bb b/packages/tapioca/libjingle-tapioca_svn.bb
index 5004cd4271..91214fa941 100644
--- a/packages/tapioca/libjingle-tapioca_svn.bb
+++ b/packages/tapioca/libjingle-tapioca_svn.bb
@@ -1,5 +1,4 @@
 PR = "r0"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>
 LICENSE  = "BERKLEY"
 DEPENDS  = "openssl ortp speex expat"
 PROVIDES = "libjingle"
diff --git a/packages/tapioca/tapioca-xmpp_0.3.0.bb b/packages/tapioca/tapioca-xmpp_0.3.0.bb
index 4b4dc1414c..bd85743b00 100644
--- a/packages/tapioca/tapioca-xmpp_0.3.0.bb
+++ b/packages/tapioca/tapioca-xmpp_0.3.0.bb
@@ -1,5 +1,4 @@
 PR = "r1"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>
 HOMEPAGE = "http://tapioca-voip.sourceforge.net/wiki/index.php/Tapioca"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 dbus libjingle openssl tapioca"
diff --git a/packages/tapioca/tapioca_0.3.0.bb b/packages/tapioca/tapioca_0.3.0.bb
index 05ff71b160..f0f3b00ced 100644
--- a/packages/tapioca/tapioca_0.3.0.bb
+++ b/packages/tapioca/tapioca_0.3.0.bb
@@ -1,5 +1,4 @@
 PR = "r1"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>
 HOMEPAGE = "http://tapioca-voip.sourceforge.net/wiki/index.php/Tapioca"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 dbus"
diff --git a/packages/tapioca/tapiocaui_0.3.0.bb b/packages/tapioca/tapiocaui_0.3.0.bb
index d563f307ca..7781324b8d 100644
--- a/packages/tapioca/tapiocaui_0.3.0.bb
+++ b/packages/tapioca/tapiocaui_0.3.0.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Koen Kooi <Koen@dominion.kabel.utwente.nl>"
 HOMEPAGE = "http://tapioca-voip.sourceforge.net/wiki/index.php/Tapioca"
 LICENSE = "LGPL"
 DEPENDS = "gtk+ glib-2.0 dbus gconf tapioca-xmpp tapioca farsight gst-plugins-farsight"
diff --git a/packages/tar/tar_1.13.93.bb b/packages/tar/tar_1.13.93.bb
index 971bc56b53..6c7139595f 100644
--- a/packages/tar/tar_1.13.93.bb
+++ b/packages/tar/tar_1.13.93.bb
@@ -2,7 +2,6 @@ SECTION = "base"
 DESCRIPTION = "GNU tar saves many files together into a single tape \
 or disk archive, and can restore individual files from the archive."
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PR = "r1"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/tar/tar-${PV}.tar.gz \
diff --git a/packages/tasklistapplet/tasklistapplet_1.0.5.bb b/packages/tasklistapplet/tasklistapplet_1.0.5.bb
index f600286db2..b72ca63358 100644
--- a/packages/tasklistapplet/tasklistapplet_1.0.5.bb
+++ b/packages/tasklistapplet/tasklistapplet_1.0.5.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "TaskList Applet"
 SECTION = "opie/applets"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 HOMEPAGE = "http://sourceforge.net/projects/subapplet/"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/tasklist-105.tar.gz"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index d0c682fe52..5b34742c1c 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-MAINTAINER = "Richard Purdie <richard@openedhand.com>"
 PR = "r6"
 
 PACKAGES = "task-base \
diff --git a/packages/tasks/task-bootstrap-unionroot.bb b/packages/tasks/task-bootstrap-unionroot.bb
index 5db841903d..4efa52e00a 100644
--- a/packages/tasks/task-bootstrap-unionroot.bb
+++ b/packages/tasks/task-bootstrap-unionroot.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Core packages required for a basic installation with unionroot"
-MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 PROVIDES = "task-bootstrap"
 RPROVIDES = "task-bootstrap"
 PR = "r2"
diff --git a/packages/tasks/task-bootstrap.bb b/packages/tasks/task-bootstrap.bb
index ef76ec4345..5f625354d1 100644
--- a/packages/tasks/task-bootstrap.bb
+++ b/packages/tasks/task-bootstrap.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Core packages required for a basic installation"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r25"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
diff --git a/packages/tasks/task-dvb.bb b/packages/tasks/task-dvb.bb
index 335ab27e8d..c72bfcb41d 100644
--- a/packages/tasks/task-dvb.bb
+++ b/packages/tasks/task-dvb.bb
@@ -1,6 +1,5 @@
 PACKAGES = task-dvb
 DESCRIPTION = "Meta-package for DVB application"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 ALLOW_EMPTY = 1
 PR = "r5"
 
diff --git a/packages/tasks/task-essential-parts.bb b/packages/tasks/task-essential-parts.bb
index 49183170c4..82c11537f8 100644
--- a/packages/tasks/task-essential-parts.bb
+++ b/packages/tasks/task-essential-parts.bb
@@ -6,7 +6,6 @@
 # Date: 23-Apr-06
 
 DESCRIPTION = "Creates all task-essential-* tasks"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 
 ######################################################################################
diff --git a/packages/tasks/task-essential-to-boot.bb b/packages/tasks/task-essential-to-boot.bb
index 8bcd182b58..565823298a 100644
--- a/packages/tasks/task-essential-to-boot.bb
+++ b/packages/tasks/task-essential-to-boot.bb
@@ -6,7 +6,6 @@
 # Date: 23-Apr-06
 
 DESCRIPTION = "This task includes everything to make a bootable image. And not a bit more."
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 
 ######################################################################################
diff --git a/packages/tasks/task-mythfront.bb b/packages/tasks/task-mythfront.bb
index a938a12e57..a22f92fc6b 100644
--- a/packages/tasks/task-mythfront.bb
+++ b/packages/tasks/task-mythfront.bb
@@ -1,6 +1,5 @@
 PACKAGES = "${PN}"
 DESCRIPTION = "Meta-package for MythTV diskless frontend"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 ALLOW_EMPTY = 1
 PR = "r6"
 
diff --git a/packages/tasks/task-native-sdk.bb b/packages/tasks/task-native-sdk.bb
index e53001928f..b164363612 100644
--- a/packages/tasks/task-native-sdk.bb
+++ b/packages/tasks/task-native-sdk.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Packages required for native (on-device) SDK"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "MIT"
 DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
 RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \
diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index a9405522a1..88ede0206c 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Tasks for OPIE stuff"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 SECTION = "opie/base"
 ALLOW_EMPTY = 1
 PACKAGE_ARCH = "all"
diff --git a/packages/tasks/task-pivotboot.bb b/packages/tasks/task-pivotboot.bb
index 091f70f459..32e319cae3 100644
--- a/packages/tasks/task-pivotboot.bb
+++ b/packages/tasks/task-pivotboot.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Basic packages required for a pivot root image"
-MAINTAINER = "Jonathan McDowell <noodles@earth.li>"
 PR = "r0"
 
 # The PIVOTBOOT_EXTRA_ variables are often manipulated by the
diff --git a/packages/tasks/task-python-everything_20060425.bb b/packages/tasks/task-python-everything_20060425.bb
index 7fd4c8f286..5c54a20bbb 100644
--- a/packages/tasks/task-python-everything_20060425.bb
+++ b/packages/tasks/task-python-everything_20060425.bb
@@ -1,5 +1,4 @@
 DESCRIPTION= "Everything Python"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
 PR = "ml10"
diff --git a/packages/tasks/task-python-sharprom_20060425.bb b/packages/tasks/task-python-sharprom_20060425.bb
index bb62a15472..25841b357a 100644
--- a/packages/tasks/task-python-sharprom_20060425.bb
+++ b/packages/tasks/task-python-sharprom_20060425.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Everything Python for SharpROM"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
 PR = "ml6"
diff --git a/packages/tasks/task-xterminal.bb b/packages/tasks/task-xterminal.bb
index 77eb094caa..489096eb27 100644
--- a/packages/tasks/task-xterminal.bb
+++ b/packages/tasks/task-xterminal.bb
@@ -1,6 +1,5 @@
 PACKAGES = task-xterminal
 DESCRIPTION = "Meta-package for diskless X terminal"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 ALLOW_EMPTY = 1
 PR = "r0"
 
diff --git a/packages/tcp-wrappers/tcp-wrappers_7.6.bb b/packages/tcp-wrappers/tcp-wrappers_7.6.bb
index bff4d720df..dff7671583 100644
--- a/packages/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/packages/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Tools for monitoring and filtering incoming requests for tcp \
 	      services."
 LICENSE = "tcp-wrappers"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "optional"
 SECTION = "console/network"
 PR="r1"
diff --git a/packages/tcptrack/tcptrack_1.1.2.bb b/packages/tcptrack/tcptrack_1.1.2.bb
index 73799d2292..edccba93ad 100644
--- a/packages/tcptrack/tcptrack_1.1.2.bb
+++ b/packages/tcptrack/tcptrack_1.1.2.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION = "tcptrack is a packet sniffer, which passively watches for \
 connections on a specified network interface, tracks their states, and lists \
 them in a manner similar to the Unix 'top' command."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "LGPL"
 DEPENDS = "ncurses libpcap"
 
diff --git a/packages/telepathy/telepathy-gabble_0.3.0.bb b/packages/telepathy/telepathy-gabble_0.3.0.bb
index 78440a7148..b9675031e2 100644
--- a/packages/telepathy/telepathy-gabble_0.3.0.bb
+++ b/packages/telepathy/telepathy-gabble_0.3.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Gabble: a Jabber/XMPP connection manager"
 HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus loudmouth"
 LICENSE = "lgpl"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz"
 
diff --git a/packages/teleport/teleport_0.33.bb b/packages/teleport/teleport_0.33.bb
index d25398220b..8ebb7801e6 100644
--- a/packages/teleport/teleport_0.33.bb
+++ b/packages/teleport/teleport_0.33.bb
@@ -3,7 +3,6 @@ LICENSE = "GPL"
 
 DESCRIPTION = "Teleport app"
 DEPENDS = "gtk+ libgpewidget libdisplaymigration libgcrypt sqlite"
-MAINTAINER = "Koen Kooi  <koen@linuxtogo.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 PR = "r2"
diff --git a/packages/teleport/teleport_0.34.bb b/packages/teleport/teleport_0.34.bb
index f97432d8a5..ce982c9490 100644
--- a/packages/teleport/teleport_0.34.bb
+++ b/packages/teleport/teleport_0.34.bb
@@ -2,5 +2,4 @@ inherit gpe
 LICENSE = "GPL"
 DESCRIPTION = "Teleport app"
 DEPENDS = "gtk+ libgpewidget libdisplaymigration libgcrypt sqlite"
-MAINTAINER = "Koen Kooi  <koen@linuxtogo.org>"SECTION = "gpe"
 PRIORITY = "optional"
diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb
index 838447fa57..4689598394 100644
--- a/packages/tetex/tetex_3.0.bb
+++ b/packages/tetex/tetex_3.0.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.tug.org/tetex"
 LICENSE = "GPL"
 SECTION = "console/utils"
 DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r5"
 
 SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \
diff --git a/packages/texmaker/texmaker_1.3.bb b/packages/texmaker/texmaker_1.3.bb
index 34704ba111..7f14e90b34 100644
--- a/packages/texmaker/texmaker_1.3.bb
+++ b/packages/texmaker/texmaker_1.3.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "TeXmaker is a free cross-platform LaTeX editor"
 HOMEPAGE = "http://www.xm1math.net/texmaker"
 SECTION = "x11/apps"
 LICENSE = "GPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 
 SRC_URI = "http://www.xm1math.net/texmaker/texmaker-${PV}.tar.bz2"
 
diff --git a/packages/thc/hydra_4.4.bb b/packages/thc/hydra_4.4.bb
index dacb5ada8d..4794027f2b 100644
--- a/packages/thc/hydra_4.4.bb
+++ b/packages/thc/hydra_4.4.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "A very fast network logon cracker which support many different services"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "console/network"
 DEPENDS = "openssl"
 LICENSE = "GPL"
diff --git a/packages/thc/hydra_4.5.bb b/packages/thc/hydra_4.5.bb
index 42134be724..fa7063687c 100644
--- a/packages/thc/hydra_4.5.bb
+++ b/packages/thc/hydra_4.5.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "A very fast network logon cracker which support many different services"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://thc.org/thc-hydra/"
 SECTION = "console/network"
 DEPENDS = "openssl"
diff --git a/packages/thttpd/thttpd_2.25b.bb b/packages/thttpd/thttpd_2.25b.bb
index bbb02199a7..c5d15269ea 100644
--- a/packages/thttpd/thttpd_2.25b.bb
+++ b/packages/thttpd/thttpd_2.25b.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "A simple, small, portable, fast, and secure HTTP server."
 LICENSE = "BSD"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://www.acme.com/software/thttpd/"
 PR="r5"
 
diff --git a/packages/tickypip/tickypip-levels_1.1.bb b/packages/tickypip/tickypip-levels_1.1.bb
index c92a8a1169..4e090db80a 100644
--- a/packages/tickypip/tickypip-levels_1.1.bb
+++ b/packages/tickypip/tickypip-levels_1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Tickypip levels from NetWalk Group"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "${PN}"
 SRC_DISTRIBUTE_LICENSES += "${PN}"
 AUTHOR = "NetWalk Group <netwalkgroup@hotmail.com>"
diff --git a/packages/tickypip/tickypip_0.1.2.bb b/packages/tickypip/tickypip_0.1.2.bb
index 578989eb9a..782803ba96 100644
--- a/packages/tickypip/tickypip_0.1.2.bb
+++ b/packages/tickypip/tickypip_0.1.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Tickypip"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Christian Hammond"
 HOMEPAGE = "http://www.chipx86.com/projects/tickypip/"
diff --git a/packages/tilibs/libticables_3.9.2.bb b/packages/tilibs/libticables_3.9.2.bb
index 4f59a7fa7d..a9c785c15f 100644
--- a/packages/tilibs/libticables_3.9.2.bb
+++ b/packages/tilibs/libticables_3.9.2.bb
@@ -1,5 +1,4 @@
 LICENSE = "GPLv2"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 HOMEPAGE = "http://lpg.ticalc.org/prj_tilp/index.html"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tilp/${P}.tar.gz"
diff --git a/packages/tilibs/libticalcs_4.5.9.bb b/packages/tilibs/libticalcs_4.5.9.bb
index efe83ba746..0a2b8f6f57 100644
--- a/packages/tilibs/libticalcs_4.5.9.bb
+++ b/packages/tilibs/libticalcs_4.5.9.bb
@@ -1,5 +1,4 @@
 LICENSE = "GPLv2"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 HOMEPAGE = "http://lpg.ticalc.org/prj_tilp/index.html"
 
 DPENDS = "libticables libtifiles"
diff --git a/packages/tilibs/libtifiles_0.6.5.bb b/packages/tilibs/libtifiles_0.6.5.bb
index 62277d9656..5ac2701d9a 100644
--- a/packages/tilibs/libtifiles_0.6.5.bb
+++ b/packages/tilibs/libtifiles_0.6.5.bb
@@ -1,5 +1,4 @@
 LICENSE = "GPLv2"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 HOMEPAGE = "http://lpg.ticalc.org/prj_tilp/index.html"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tilp/${P}.tar.gz"
diff --git a/packages/time/time.inc b/packages/time/time.inc
index 81d6446758..4f006a693c 100644
--- a/packages/time/time.inc
+++ b/packages/time/time.inc
@@ -2,5 +2,4 @@ DESCRIPTION = "time measures many of the CPU resources, such as time and \
 memory, that other programs use."
 HOMEPAGE = "http://www.gnu.org/software/time/"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "utils"
diff --git a/packages/timesleuth/timesleuth_1.0.5.bb b/packages/timesleuth/timesleuth_1.0.5.bb
index ff8fa9d10f..386695d5a9 100644
--- a/packages/timesleuth/timesleuth_1.0.5.bb
+++ b/packages/timesleuth/timesleuth_1.0.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Time Sleuth"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Dafydd Walters"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/applications-TimeSleuth.html"
diff --git a/packages/timezones/timezones_1.2.0.bb b/packages/timezones/timezones_1.2.0.bb
index 4a36fc3abd..676da9859f 100644
--- a/packages/timezones/timezones_1.2.0.bb
+++ b/packages/timezones/timezones_1.2.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Timezone data"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/tinc/tinc_1.0.2.bb b/packages/tinc/tinc_1.0.2.bb
index 26a6d7370e..26a97ed38a 100644
--- a/packages/tinc/tinc_1.0.2.bb
+++ b/packages/tinc/tinc_1.0.2.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION ="tinc is a Virtual Private Network (VPN) daemon"
 HOMEPAGE = "http://www.tinc-vpn.org/"
 LICENSE = "GPLv2"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 PR = "r1"
 
 SRC_URI="http://www.tinc-vpn.org/packages/tinc-1.0.2.tar.gz \
diff --git a/packages/tinymail/tinymail_svn.bb b/packages/tinymail/tinymail_svn.bb
index b1195af484..be12b8ae66 100644
--- a/packages/tinymail/tinymail_svn.bb
+++ b/packages/tinymail/tinymail_svn.bb
@@ -2,7 +2,6 @@ SECTION = "x11/utils"
 DEPENDS = "gtk+ glib-2.0 gnome-vfs-dbus libgnomeui eds-dbus"
 DESCRIPTION = "TinyMail is an attempt to create an E-mail client for mobile devices"
 LICENSE = "GPL"
-MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 
 PV = "0.0+svn${SRCDATE}"
 PR = "r1"
diff --git a/packages/tmake/tmake_1.11.bb b/packages/tmake/tmake_1.11.bb
index 63f871918a..23147a98c7 100644
--- a/packages/tmake/tmake_1.11.bb
+++ b/packages/tmake/tmake_1.11.bb
@@ -4,7 +4,6 @@ LICENSE = "Unknown"
 DEPENDS = ""
 SECTION = "devel"
 PRIORITY = "optional"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 S = "${WORKDIR}/tmake-${PV}"
 
diff --git a/packages/tomoe/libtomoe-gtk_0.1.0.bb b/packages/tomoe/libtomoe-gtk_0.1.0.bb
index a4dbff2085..edbbc3a2e9 100644
--- a/packages/tomoe/libtomoe-gtk_0.1.0.bb
+++ b/packages/tomoe/libtomoe-gtk_0.1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A handwriting recognition engine"
 HOMEPAGE = "http://tomoe.sourceforge.net"
 SECTION = "libs"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 DEPENDS = "gtk+ tomoe"
 LICENSE = "LGPL"
 
diff --git a/packages/tomoe/tomoe_0.2.1.bb b/packages/tomoe/tomoe_0.2.1.bb
index f321142dd1..7affece4a4 100644
--- a/packages/tomoe/tomoe_0.2.1.bb
+++ b/packages/tomoe/tomoe_0.2.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A handwriting recognition engine"
 HOMEPAGE = "http://tomoe.sourceforge.net"
 SECTION = "libs"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE = "LGPL"
 
 inherit autotools pkgconfig
diff --git a/packages/tomoe/uim-tomoe-gtk_0.2.0.bb b/packages/tomoe/uim-tomoe-gtk_0.2.0.bb
index d0b1c5a385..34503c0197 100644
--- a/packages/tomoe/uim-tomoe-gtk_0.2.0.bb
+++ b/packages/tomoe/uim-tomoe-gtk_0.2.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A handwriting recognition engine"
 HOMEPAGE = "http://tomoe.sourceforge.net"
 SECTION = "libs"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 DEPENDS = "gtk+ uim tomoe"
 LICENSE = "LGPL"
 
diff --git a/packages/tor/tor_0.1.1.23.bb b/packages/tor/tor_0.1.1.23.bb
index 54f9ed2f7d..29cda6945f 100644
--- a/packages/tor/tor_0.1.1.23.bb
+++ b/packages/tor/tor_0.1.1.23.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Tor is a network of virtual tunnels that allows people and groups
               to improve their privacy and security on the Internet."
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "Bastian Ballmann <balle@chaostal.de>"
 HOMEPAGE = "http://tor.eff.org"
 LICENSE = "BSD"
 PR="r0"
diff --git a/packages/treecc/treecc-native_0.3.6.bb b/packages/treecc/treecc-native_0.3.6.bb
index fac326db1c..bcdd2e7677 100644
--- a/packages/treecc/treecc-native_0.3.6.bb
+++ b/packages/treecc/treecc-native_0.3.6.bb
@@ -1,7 +1,6 @@
 require treecc_${PV}.bb
 SECTION = "devel"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/treecc-${PV}"
-MAINTAINER = "Kirill Kononenko <krokas@aport.ru"
 S = "${WORKDIR}/treecc-${PV}"
 
 inherit native autotools
diff --git a/packages/treecc/treecc_0.3.6.bb b/packages/treecc/treecc_0.3.6.bb
index bd8e992724..9a6c7c8eda 100644
--- a/packages/treecc/treecc_0.3.6.bb
+++ b/packages/treecc/treecc_0.3.6.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Tree Compiler-Compiler from dotGNU"
 SECTION = "devel"
 LICENSE = "GPL-2"
 HOMEPAGE = "http://www.southern-storm.com.au/treecc.html"
-MAINTAINER = "Kirill Kononenko <krokas@aport.ru>"
 PRIORITY = "optional"
 
 SRC_URI = "http://www.southern-storm.com.au/download/treecc-${PV}.tar.gz \
diff --git a/packages/tremor/tremor_20041119.bb b/packages/tremor/tremor_20041119.bb
index 63de7a4239..276ac491e0 100644
--- a/packages/tremor/tremor_20041119.bb
+++ b/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/packages/tremor/tremor_svn.bb b/packages/tremor/tremor_svn.bb
index fd3dead30a..c7830f2063 100644
--- a/packages/tremor/tremor_svn.bb
+++ b/packages/tremor/tremor_svn.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."
 PV = "1:0.0+svn${SRCDATE}"
diff --git a/packages/tsclient/tsclient_0.132.bb b/packages/tsclient/tsclient_0.132.bb
index 8a80855219..b6a73c0728 100644
--- a/packages/tsclient/tsclient_0.132.bb
+++ b/packages/tsclient/tsclient_0.132.bb
@@ -6,7 +6,6 @@ PR="r1"
 
 DESCRIPTION="Terminal Server Client (tsclient) is a frontend for rdesktop and other remote desktop tools"
 HOMEPAGE="http://www.gnomepro.com/tsclient/"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE="GPL"
 
 SRC_URI="http://www.gnomepro.com/tsclient/tsclient-${PV}.tar.gz \
diff --git a/packages/tsclient/tsclient_0.140.bb b/packages/tsclient/tsclient_0.140.bb
index 2d744687ac..0096338958 100644
--- a/packages/tsclient/tsclient_0.140.bb
+++ b/packages/tsclient/tsclient_0.140.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "tsclient == a frontend for rdesktop and other remote desktop tool"
 HOMEPAGE = "http://www.gnomepro.com/tsclient/"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gtk+ libpanelapplet rdesktop"
 RDEPENDS = "rdesktop"
diff --git a/packages/ttf-fonts/ttf-dejavu_2.9.bb b/packages/ttf-fonts/ttf-dejavu_2.9.bb
index 4599e6e016..d5f24052bf 100644
--- a/packages/ttf-fonts/ttf-dejavu_2.9.bb
+++ b/packages/ttf-fonts/ttf-dejavu_2.9.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "DejaVu font - TTF Edition"
 LICENSE = "Bitstream Vera"
 HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.gz"
 
diff --git a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
index 0cceb51ff5..f81097c22f 100644
--- a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
+++ b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Hunky fonts - TTF Version"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "LGPL"
 HOMEPAGE = "http://sourceforge.net/projects/hunkyfonts"
 PR = "r0"
diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb
index f52d5c18cd..d1c4882d14 100644
--- a/packages/ttf-fonts/ttf-sazanami_20040629.bb
+++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Sazanami Gothic/Mincho Japanese TrueType fonts"
 DESCRIPTION_ttf-sazanami-gothic = "Sazanami Gothic Japanese TrueType font"
 DESCRIPTION_ttf-sazanami-mincho = "Sazanami Mincho Japanese TrueType font"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE = "${PN}"
 SRC_DISTRIBUTE_LICENSES += "${PN}"
 AUTHOR = "Electronic Font Open Laboratory (/efont/)"
diff --git a/packages/ttyconv/ttyconv_0.2.3.bb b/packages/ttyconv/ttyconv_0.2.3.bb
index 19aec66b2b..1b38d31328 100644
--- a/packages/ttyconv/ttyconv_0.2.3.bb
+++ b/packages/ttyconv/ttyconv_0.2.3.bb
@@ -5,7 +5,6 @@
 DESCRIPTION = "Small app to convert terminal sessions from one encoding to another."
 HOMEPAGE = "http://www.bedroomlan.org/~alexios/coding_ttyconv.html"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "optional"
 SECTION = "console/utils"
 PR = "r1"
diff --git a/packages/twin/twin_0.4.6.bb b/packages/twin/twin_0.4.6.bb
index cf40f9cb52..fdb9c25e39 100644
--- a/packages/twin/twin_0.4.6.bb
+++ b/packages/twin/twin_0.4.6.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Twin is a text-mode windowing environment: it draws and manages text windows on a text-mode display, like X11 does for graphical windows. It has a built-in window manager and terminal emulator, and can be used as server for remote clients in the same style as X11. It can display on Linux console, on X11 and inside itself."
-MAINTAINER = "Chris Lord <cwiiis@blueyonder.co.uk>"
 SECTION = "console/utils"
 
 DEPENDS = "coreutils-native"
diff --git a/packages/twin/twutils_0.2.bb b/packages/twin/twutils_0.2.bb
index f7a1fc3778..b50a080944 100644
--- a/packages/twin/twutils_0.2.bb
+++ b/packages/twin/twutils_0.2.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Utilities for twin. Currently contains 'twkalc', a calculator derived from kcalc."
-MAINTAINER = "Chris Lord <cwiiis@blueyonder.co.uk>"
 DEPENDS = "twin"
 
 SECTION = "console/utils"
diff --git a/packages/twisted/twisted_1.2.0.bb b/packages/twisted/twisted_1.2.0.bb
index 079118f206..3424f8c387 100644
--- a/packages/twisted/twisted_1.2.0.bb
+++ b/packages/twisted/twisted_1.2.0.bb
@@ -4,7 +4,6 @@ Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of p
 HOMEPAGE = "http://www.twistedmatrix.com"
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 RDEPENDS = "python-core"
 
diff --git a/packages/txdrug/txdrug_0.1.bb b/packages/txdrug/txdrug_0.1.bb
index 121dfdbad3..cd82234955 100644
--- a/packages/txdrug/txdrug_0.1.bb
+++ b/packages/txdrug/txdrug_0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Tx Drug Database"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "sqlite"
 PR = "r2"
diff --git a/packages/tximage/tximage_0.2.bb b/packages/tximage/tximage_0.2.bb
index 37d0ea6dc6..1911e4fb51 100644
--- a/packages/tximage/tximage_0.2.bb
+++ b/packages/tximage/tximage_0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Tx Image Viewer"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://community.zaurus.com/projects/tximage/"
 PR = "r2"
diff --git a/packages/u2nl/u2nl_1.1.bb b/packages/u2nl/u2nl_1.1.bb
index aa4109b666..7cfa7b75ba 100644
--- a/packages/u2nl/u2nl_1.1.bb
+++ b/packages/u2nl/u2nl_1.1.bb
@@ -3,7 +3,6 @@ tunneling each and every TCP network connection from a Linux (2.4 and above, \
 with netfilter) computer through an http CONNECT proxy."
 HOMEPAGE = "http://www.reitwiessner.de/programs/u2nl.html"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/network"
 PRIORITY = "optional"
 
diff --git a/packages/uboot/u-boot_1.1.2.bb b/packages/uboot/u-boot_1.1.2.bb
index 8ddcfbd4b4..f0752aa664 100644
--- a/packages/uboot/u-boot_1.1.2.bb
+++ b/packages/uboot/u-boot_1.1.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "U-boot bootloader"
 PROVIDES = "virtual/bootloader"
 SECTION = "bootloader"
-MAINTAINER = "Holger Schurig"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
diff --git a/packages/uboot/u-boot_1.1.4.bb b/packages/uboot/u-boot_1.1.4.bb
index bedf9f4198..448dff38fa 100644
--- a/packages/uboot/u-boot_1.1.4.bb
+++ b/packages/uboot/u-boot_1.1.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "U-boot bootloader"
 PROVIDES = "virtual/bootloader"
 SECTION = "bootloader"
-MAINTAINER = "Holger Schurig"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
diff --git a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
index efe4addbb0..3fb7ee55ea 100644
--- a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
+++ b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "U-boot bootloader"
 PROVIDES = "virtual/bootloader"
 SECTION = "bootloader"
-MAINTAINER = "philip@balister.org"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
diff --git a/packages/uboot/uboot_cvs.bb b/packages/uboot/uboot_cvs.bb
index 0174fc0560..617babcf4a 100644
--- a/packages/uboot/uboot_cvs.bb
+++ b/packages/uboot/uboot_cvs.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "U-boot bootloader"
 SECTION = "bootloader"
-MAINTAINER = "Cliff Brake <cliff.brake@gmail.com>"
 PRIORITY = "optional"
 LICENSE = "GPL"
 PV = "0.0+cvs${SRCDATE}"
diff --git a/packages/uclibc++/uclibc++_0.1.9.bb b/packages/uclibc++/uclibc++_0.1.9.bb
index 90154e3a9d..fff6daf691 100644
--- a/packages/uclibc++/uclibc++_0.1.9.bb
+++ b/packages/uclibc++/uclibc++_0.1.9.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A C++ standard library targeted towards the embedded \
 systems/software market."
 HOMEPAGE = "http://cxx.uclibc.org/"
 LICENSE = "LGPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PRIORITY = "optional"
 SECTION = "libs"
 
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc
index 77e9312f61..1a829a3640 100644
--- a/packages/uclibc/uclibc.inc
+++ b/packages/uclibc/uclibc.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "C library for embedded systems"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
diff --git a/packages/udhcp/udhcp_0.9.8.bb b/packages/udhcp/udhcp_0.9.8.bb
index 98f257a603..0974739514 100644
--- a/packages/udhcp/udhcp_0.9.8.bb
+++ b/packages/udhcp/udhcp_0.9.8.bb
@@ -1,7 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "Small dhcp client and dhcp server.  Designed for embedded use."
 HOMEPAGE = "http://udhcp.busybox.net/"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPL"
 
 SRC_URI = "http://udhcp.busybox.net/source/udhcp-${PV}.tar.gz \
diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb
index c9457e139e..90c9b432fb 100644
--- a/packages/uicmoc/uicmoc-native_2.3.10.bb
+++ b/packages/uicmoc/uicmoc-native_2.3.10.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r2"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
diff --git a/packages/uicmoc/uicmoc3-native_3.3.5.bb b/packages/uicmoc/uicmoc3-native_3.3.5.bb
index d75b9c889b..153e2bae2d 100644
--- a/packages/uicmoc/uicmoc3-native_3.3.5.bb
+++ b/packages/uicmoc/uicmoc3-native_3.3.5.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E)
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL QPL"
 PR = "r3"
 
diff --git a/packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb b/packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb
index e41bf2f4d3..c08d308c0a 100644
--- a/packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb
+++ b/packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A lightweight C++ based library for XMLRPC applications"
 HOMEPAGE = "http://ulxmlrpcpp.sf.net"
 LICENSE = "LGPL"
 SECTION = "libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "expat"
 PR = "r0"
 
diff --git a/packages/unionfs/unionfs.inc b/packages/unionfs/unionfs.inc
index 72d4ed1fca..652d79cc83 100644
--- a/packages/unionfs/unionfs.inc
+++ b/packages/unionfs/unionfs.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "A stackable unification file system, which can appear to \
 merge the contents of several directories (branches), while keeping their \
 physical content separate."
 HOMEPAGE = "http://www.fsl.cs.sunysb.edu/project-unionfs.html"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPL"
 
 SRC_URI = "ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-${PV}.tar.gz \
diff --git a/packages/unionfs/unionroot-utils_0.1.1.bb b/packages/unionfs/unionroot-utils_0.1.1.bb
index 278decb48c..0da9c9a731 100644
--- a/packages/unionfs/unionroot-utils_0.1.1.bb
+++ b/packages/unionfs/unionroot-utils_0.1.1.bb
@@ -5,7 +5,6 @@ DEPENDS = "ipkg-collateral unionroot busybox"
 RDEPENDS = "ipkg-collateral unionroot busybox"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 
 PR = "2"
 
diff --git a/packages/unionfs/unionroot_0.1.1.bb b/packages/unionfs/unionroot_0.1.1.bb
index 50109b47aa..4047c2f3c7 100644
--- a/packages/unionfs/unionroot_0.1.1.bb
+++ b/packages/unionfs/unionroot_0.1.1.bb
@@ -5,7 +5,6 @@ DEPENDS = "busybox base-files"
 RDEPENDS = "busybox base-files"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 
 SRC_URI = "file://init.unionroot"
 
diff --git a/packages/update-rc.d/update-rc.d_0.6.bb b/packages/update-rc.d/update-rc.d_0.6.bb
index ba2f551371..38b4c218f5 100644
--- a/packages/update-rc.d/update-rc.d_0.6.bb
+++ b/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/packages/update-rc.d/update-rc.d_0.7.bb b/packages/update-rc.d/update-rc.d_0.7.bb
index ae1cfe83fe..87d1aef9d8 100644
--- a/packages/update-rc.d/update-rc.d_0.7.bb
+++ b/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/packages/upnp/libupnp_1.3.1.bb b/packages/upnp/libupnp_1.3.1.bb
index 80f0999dd6..14d1b9d263 100644
--- a/packages/upnp/libupnp_1.3.1.bb
+++ b/packages/upnp/libupnp_1.3.1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "The Linux* SDK for UPnP* Devices (libupnp) provides developers with an API and open source code for building control points, devices, and bridges that are compliant with Version 1.0 of the Universal Plug and Play Device Architecture Specification."
 HOMEPAGE = "http://upnp.sourceforge.net/"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE = "BSD"
 
 LEAD_SONAME = "libupnp"
diff --git a/packages/upslug/upslug-native_1.0.bb b/packages/upslug/upslug-native_1.0.bb
index 6f76bbe738..1be9caf927 100644
--- a/packages/upslug/upslug-native_1.0.bb
+++ b/packages/upslug/upslug-native_1.0.bb
@@ -3,7 +3,6 @@
 PR = "r0"
 DESCRIPTION = "NSLU2 binary upload tool"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL-2"
diff --git a/packages/upslug/upslug-native_cvs.bb b/packages/upslug/upslug-native_cvs.bb
index 097d7a26bd..040f69178c 100644
--- a/packages/upslug/upslug-native_cvs.bb
+++ b/packages/upslug/upslug-native_cvs.bb
@@ -3,7 +3,6 @@
 PR = "r0"
 DESCRIPTION = "NSLU2 binary upload tool"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL-2"
diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc
index 24820f556e..0a91bc3fd1 100644
--- a/packages/upslug/upslug2.inc
+++ b/packages/upslug/upslug2.inc
@@ -3,7 +3,6 @@
 PR = "r0"
 DESCRIPTION = "NSLU2 binary upload tool (version 2)"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "MIT"
diff --git a/packages/uqm/uqm_0.3.bb b/packages/uqm/uqm_0.3.bb
index b31fb6af01..036e1a9bc1 100644
--- a/packages/uqm/uqm_0.3.bb
+++ b/packages/uqm/uqm_0.3.bb
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 DEPENDS = "virtual/libsdl libsdl-image libsdl-net libvorbis libogg zlib"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Paul Eggleton <paule@handhelds.org>"
 LICENSE = "GPL"
 
 PR = "r1"
diff --git a/packages/uqm/uqm_0.5.0.bb b/packages/uqm/uqm_0.5.0.bb
index a12ae12492..0367137e03 100644
--- a/packages/uqm/uqm_0.5.0.bb
+++ b/packages/uqm/uqm_0.5.0.bb
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 DEPENDS = "virtual/libsdl libsdl-image libsdl-net libvorbis libogg zlib"
 SECTION = "games"
 PRIORITY = "optional"
-MAINTAINER = "Paul Eggleton <paule@handhelds.org>"
 LICENSE = "GPL"
 
 PR = "r0"
diff --git a/packages/usbview/usbview_1.0.bb b/packages/usbview/usbview_1.0.bb
index 5e719e8e65..27d3c713dd 100644
--- a/packages/usbview/usbview_1.0.bb
+++ b/packages/usbview/usbview_1.0.bb
@@ -5,7 +5,6 @@
 DESCRIPTION="USBView is a GTK program that displays the topography of the \
 	devices that are plugged into the USB bus on a Linux machine."
 HOMEPAGE="http://www.kroah.com/linux-usb/"
-MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 LICENSE="GPL"
 
 SRC_URI="http://www.kroah.com/linux-usb/${PN}-${PV}.tar.gz \
diff --git a/packages/ushare/ushare_0.9.7.bb b/packages/ushare/ushare_0.9.7.bb
index 539126c7a1..b5b2d1f4bc 100644
--- a/packages/ushare/ushare_0.9.7.bb
+++ b/packages/ushare/ushare_0.9.7.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "ushare is a UPnP media server"
 LICENSE = "GPL"
 HOMEPAGE = "http://ushare.geexbox.org/"
-MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 DEPENDS = "libupnp virtual/libiconv virtual/libintl"
 SRC_URI = "http://ushare.geexbox.org/releases/ushare-0.9.7.tar.bz2"
 S = "${WORKDIR}/ushare-${PV}"
diff --git a/packages/usound/usound_0.2.0.bb b/packages/usound/usound_0.2.0.bb
index 659cdd85ef..0ac4022e91 100644
--- a/packages/usound/usound_0.2.0.bb
+++ b/packages/usound/usound_0.2.0.bb
@@ -2,7 +2,6 @@ LICENSE = "GPL"
 DESCRIPTION = "The Useful Sound Daemon"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "pth"
 
 SRC_URI = "http://mattcamp.paunix.org/usound/usound-${PV}.tar.gz"
diff --git a/packages/usrp/usrp_0.8.bb b/packages/usrp/usrp_0.8.bb
index 1b9966f1ce..16059186d0 100644
--- a/packages/usrp/usrp_0.8.bb
+++ b/packages/usrp/usrp_0.8.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Support software for the Universal Software Radio Peripheral (USRP)"
 LICENSE = "GPL"
-MAINTAINER = "Philip Balister philip@balister.org"
 HOMEPAGE = "http://comsec.com/wiki?UniversalSoftwareRadioPeripheral"
 SECTION = "devel"
 DEPENDS = "swig-native sdcc-native libusb"
diff --git a/packages/vde/vde_2.0.2.bb b/packages/vde/vde_2.0.2.bb
index 93fe8dc1d3..a1ecbc8a55 100644
--- a/packages/vde/vde_2.0.2.bb
+++ b/packages/vde/vde_2.0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "VDE can be used: (i) to create a general purpose tunnel (every protocol that runs on a Ethernet can be put into the tunnel) (ii) to connect a set of virtual machine to the Internet with no need of free access of tuntap (iii) to support mobility: a VDE can stay interconnected despite of the change of virtual cables, i.e. the change of IP addresses and interface in the real world"
 LICENSE = GPLv2"
 HOMEPAGE = "http://vde.sf.net"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
 RRECOMMENDS = "kernel-module-tun kernel-module-tap"
 
diff --git a/packages/vectoroids/vectoroids_1.1.0.bb b/packages/vectoroids/vectoroids_1.1.0.bb
index cd8580d896..bc3883390a 100644
--- a/packages/vectoroids/vectoroids_1.1.0.bb
+++ b/packages/vectoroids/vectoroids_1.1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Clone of the classic arcade game Asteroids - SDL edition."
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb b/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
index 59ceeb26fc..3e797bd80d 100644
--- a/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
+++ b/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Bitstream Vera Monospaced Font, QPF for Qt/Embedded"
 SECTION = "opie/fonts"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "Bitstream Vera"
 PACKAGE_ARCH = "all"
 PR = "r3"
diff --git a/packages/vera-fonts/qpf-bitstream-vera_1.10.bb b/packages/vera-fonts/qpf-bitstream-vera_1.10.bb
index 6c851131d4..07ca7bda9a 100644
--- a/packages/vera-fonts/qpf-bitstream-vera_1.10.bb
+++ b/packages/vera-fonts/qpf-bitstream-vera_1.10.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "The Bitstream Vera fonts - QPF Edition"
 SECTION = "opie/fonts"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PRIORITY = "optional"
 LICENSE = "Bitstream Vera"
 PACKAGE_ARCH = "all"
diff --git a/packages/visiscript/visiscript_0.3.2.bb b/packages/visiscript/visiscript_0.3.2.bb
index 41520a062f..5f4e5d500a 100644
--- a/packages/visiscript/visiscript_0.3.2.bb
+++ b/packages/visiscript/visiscript_0.3.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "VisiScript is a simple graphical frontend for \
 scripting languages like minscript, Python,Ruby, Perl or others. \
 VisiScript runs on the Qtopia desktop environment of the Zaurus."
 SECTION = "opie/applications"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "qscintilla"
 LICENSE = "GPL"
 PR = "r1"
diff --git a/packages/visiscript/visiscript_0.4.3.bb b/packages/visiscript/visiscript_0.4.3.bb
index 977cb80738..c50da04249 100644
--- a/packages/visiscript/visiscript_0.4.3.bb
+++ b/packages/visiscript/visiscript_0.4.3.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "VisiScript is a simple graphical frontend for \
 scripting languages like minscript, Python,Ruby, Perl or others. \
 VisiScript runs on the Qtopia desktop environment of the Zaurus."
 SECTION = "opie/applications"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "qscintilla"
 LICENSE = "GPL"
 APPNAME = "visiscript"
diff --git a/packages/visual-boot/visual-boot.bb b/packages/visual-boot/visual-boot.bb
index 8ea5400900..e3bad2a4aa 100644
--- a/packages/visual-boot/visual-boot.bb
+++ b/packages/visual-boot/visual-boot.bb
@@ -6,7 +6,6 @@
 # Date: 25-Jun-06
 
 DESCRIPTION = "A simple visual boot progress for OpenZaurus"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 LICENSE = "GPL"
 
diff --git a/packages/vlan/vlan_1.8.bb b/packages/vlan/vlan_1.8.bb
index 44cc9fa06f..2b8d1d18a8 100644
--- a/packages/vlan/vlan_1.8.bb
+++ b/packages/vlan/vlan_1.8.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "802.1q vlan support program"
 RRECOMMENDS = "kernel-module-8021q"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 PR = "r2"
 
 S = "${WORKDIR}/vlan/"
diff --git a/packages/vlc/vlc-gpe_0.7.2.bb b/packages/vlc/vlc-gpe_0.7.2.bb
index 4f30e191ee..65d8fe9045 100644
--- a/packages/vlc/vlc-gpe_0.7.2.bb
+++ b/packages/vlc/vlc-gpe_0.7.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Video player and streamer - GPE edition"
 HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 PR = "r1"
 
diff --git a/packages/vlc/vlc-gpe_0.8.1.bb b/packages/vlc/vlc-gpe_0.8.1.bb
index 599701d5df..6ca35887b7 100644
--- a/packages/vlc/vlc-gpe_0.8.1.bb
+++ b/packages/vlc/vlc-gpe_0.8.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Video player and streamer - GPE edition"
 HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 PR = "r4"
 
diff --git a/packages/vlc/vlc-gpe_0.8.4.bb b/packages/vlc/vlc-gpe_0.8.4.bb
index 70da9c8ff4..32dedaa96c 100644
--- a/packages/vlc/vlc-gpe_0.8.4.bb
+++ b/packages/vlc/vlc-gpe_0.8.4.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Video player and streamer - GPE edition"
 HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
 PR = "r1"
 
diff --git a/packages/vmedit/vmedit_0.01.bb b/packages/vmedit/vmedit_0.01.bb
index 86cc3f85ec..7850095f3b 100644
--- a/packages/vmedit/vmedit_0.01.bb
+++ b/packages/vmedit/vmedit_0.01.bb
@@ -3,7 +3,6 @@ inherit gpe
 
 DEPENDS = "gtk+ libgpewidget gpe-icons"
 RDEPENDS = "gpe-icons"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 SECTION = "gpe"
 DESCRIPTION = "This is a small GTK based multi-tab text editor."
 AUTHOR = "Vladimir Martinek <vm@sykora.cz>"
diff --git a/packages/vnc/tightvnc_1.3dev7.bb b/packages/vnc/tightvnc_1.3dev7.bb
index c5fe202c64..fff01473ca 100644
--- a/packages/vnc/tightvnc_1.3dev7.bb
+++ b/packages/vnc/tightvnc_1.3dev7.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A Unix VNC client"
 HOMEPAGE = "http://www.tightvnc.com/"
 DEPENDS = "virtual/libx11 zlib libxmu libxaw"
 LICENSE = "GPL"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/vnc-tight/tightvnc-1.3dev7_unixsrc.tar.gz \
            file://Makefile"
diff --git a/packages/vpnc/vpnc_0.3.3.bb b/packages/vpnc/vpnc_0.3.3.bb
index 5bcca982e4..8aee0fa5c0 100644
--- a/packages/vpnc/vpnc_0.3.3.bb
+++ b/packages/vpnc/vpnc_0.3.3.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "A client for the Cisco3000 VPN Concentrator"
 SECTION = "console/network"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.unix-ag.uni-kl.de/~massar/vpnc/"
-MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>"
 LICENSE = "GPL"
 DEPENDS = "libgcrypt"
 RDEPENDS = "kernel-module-tun"
diff --git a/packages/vsftpd/vsftpd_2.0.5.bb b/packages/vsftpd/vsftpd_2.0.5.bb
index 9594fbfc0e..81aec46845 100644
--- a/packages/vsftpd/vsftpd_2.0.5.bb
+++ b/packages/vsftpd/vsftpd_2.0.5.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Secure ftp daemon"
 SECTION = "console/network"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
 DEPENDS = "openssl"
 PR = "r0"
diff --git a/packages/vte/vte_0.11.15.bb b/packages/vte/vte_0.11.15.bb
index d195c094eb..7b1c7c803c 100644
--- a/packages/vte/vte_0.11.15.bb
+++ b/packages/vte/vte_0.11.15.bb
@@ -1,5 +1,4 @@
 LICENSE = "LGPL"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit gnome
 
diff --git a/packages/vtun/vtun_2.6.bb b/packages/vtun/vtun_2.6.bb
index b69e0b9723..72dd3a4b9f 100644
--- a/packages/vtun/vtun_2.6.bb
+++ b/packages/vtun/vtun_2.6.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Virtual Tunnels over TCP/IP networks with traffic shaping, compression and encryption."
 HOMEPAGE = "http://vtun.sourceforge.net/"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/vtype-utils/vtype-utils_0.6.bb b/packages/vtype-utils/vtype-utils_0.6.bb
index 104e920434..2f988c77e4 100644
--- a/packages/vtype-utils/vtype-utils_0.6.bb
+++ b/packages/vtype-utils/vtype-utils_0.6.bb
@@ -6,6 +6,5 @@ DESCRIPTION = "GPE vtype file tools"
 DEPENDS = "libmimedir libgpevtype"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 LICENSE = "GPL"
 
diff --git a/packages/w3cam/w3cam_0.7.2.bb b/packages/w3cam/w3cam_0.7.2.bb
index 02e543c507..73fa406c6f 100644
--- a/packages/w3cam/w3cam_0.7.2.bb
+++ b/packages/w3cam/w3cam_0.7.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "a small and fast cgi program to retrieve images from a V4L device."
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 DEPENDS="jpeg"
 LICENSE = "GPLV2"
 PR = "r0"
diff --git a/packages/waimea/waimea_cvs.bb b/packages/waimea/waimea_cvs.bb
index 05cce5d1ce..52218b87c3 100644
--- a/packages/waimea/waimea_cvs.bb
+++ b/packages/waimea/waimea_cvs.bb
@@ -1,7 +1,6 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Waimea is a highly customizable window manager for the X Window \
 system conforming to the latest EWMH specification."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "cairo libpng xrandr libsvg-cairo libxext"
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "GPL"
diff --git a/packages/wakelan/wakelan_1.1.bb b/packages/wakelan/wakelan_1.1.bb
index 243b718dba..80f36c5ae5 100644
--- a/packages/wakelan/wakelan_1.1.bb
+++ b/packages/wakelan/wakelan_1.1.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Wakelan sends a magic packet to wake up remote PC's"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
 PR = "r2"
 
diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb
index 592f86af39..deb675901b 100644
--- a/packages/watchdog/watchdog_5.2.bb
+++ b/packages/watchdog/watchdog_5.2.bb
@@ -1,6 +1,5 @@
 #CONFFILES = "${sysconfdir}/watchdog.conf"
 DESCRIPTION = "Software watchdog"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
 PR = "r3"
 
diff --git a/packages/web/web_svn.bb b/packages/web/web_svn.bb
index 1c8d447c11..f067a2f8cc 100644
--- a/packages/web/web_svn.bb
+++ b/packages/web/web_svn.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js"
-MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Web is a multi-platform web browsing application."
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
diff --git a/packages/wget/wget_1.9.1.bb b/packages/wget/wget_1.9.1.bb
index f5bf6439dc..cc5f8bc5b8 100644
--- a/packages/wget/wget_1.9.1.bb
+++ b/packages/wget/wget_1.9.1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
 SECTION = "console/network"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = ""
 PR = "r6"
 LICENSE = "GPL"
diff --git a/packages/whois/whois.inc b/packages/whois/whois.inc
index cef785610c..15af5e8454 100644
--- a/packages/whois/whois.inc
+++ b/packages/whois/whois.inc
@@ -1,7 +1,6 @@
 DEPENDS += "gettext-native virtual/libintl"
 DESCRIPTION = "whois is an improved whois client"
 LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://www.linux.it/~md/software/"
 SECTION = "network"
 
diff --git a/packages/wiggle/wiggle_0.6.bb b/packages/wiggle/wiggle_0.6.bb
index e9c02a373d..8fd54a587a 100644
--- a/packages/wiggle/wiggle_0.6.bb
+++ b/packages/wiggle/wiggle_0.6.bb
@@ -1,7 +1,6 @@
 LICENSE = "GPL"
 DESCRIPTION = "Wiggle is a program for applying patches that patch cannot \
 apply because of conflicting changes."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/utils"
 PR = "r1"
 
diff --git a/packages/wireless-tools/wireless-tools_26.bb b/packages/wireless-tools/wireless-tools_26.bb
index 6dd54a8773..4a478663e6 100644
--- a/packages/wireless-tools/wireless-tools_26.bb
+++ b/packages/wireless-tools/wireless-tools_26.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
 SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "virtual/kernel"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r6"
 
diff --git a/packages/wireless-tools/wireless-tools_27.bb b/packages/wireless-tools/wireless-tools_27.bb
index c3d654b0c9..c26e40cf3c 100644
--- a/packages/wireless-tools/wireless-tools_27.bb
+++ b/packages/wireless-tools/wireless-tools_27.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
 SECTION = "base"
 PRIORITY = "optional"
 #DEPENDS = "virtual/kernel"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/wireless-tools/wireless-tools_28-pre13.bb b/packages/wireless-tools/wireless-tools_28-pre13.bb
index c961a25f83..170f67deeb 100644
--- a/packages/wireless-tools/wireless-tools_28-pre13.bb
+++ b/packages/wireless-tools/wireless-tools_28-pre13.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/packages/wireless-tools/wireless-tools_29-pre10.bb b/packages/wireless-tools/wireless-tools_29-pre10.bb
index f42ef62f09..8e4b9d7754 100644
--- a/packages/wireless-tools/wireless-tools_29-pre10.bb
+++ b/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>, Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/wlags-modules/wlags-modules_718.inc b/packages/wlags-modules/wlags-modules_718.inc
index e56802d5c1..df4163c2f7 100644
--- a/packages/wlags-modules/wlags-modules_718.inc
+++ b/packages/wlags-modules/wlags-modules_718.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "A driver from Agera (a card manufacturer) for wireless LAN cards
 HOMEPAGE = "http://www.agere.com/mobility/wireless_lan_drivers.html"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
-MAINTAINER = "Holger Schurig"
 DEPENDS = "virtual/kernel"
 LICENSE = "BSD"
 PR = "r1"
diff --git a/packages/wmctrl/wmctrl_1.07.bb b/packages/wmctrl/wmctrl_1.07.bb
index 59c367d310..c6cc507f5d 100644
--- a/packages/wmctrl/wmctrl_1.07.bb
+++ b/packages/wmctrl/wmctrl_1.07.bb
@@ -6,7 +6,6 @@
 # Date: 07-Jul-06
 
 DESCRIPTION = "A UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://sweb.cz/tripie/utils/wmctrl/"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc b/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc
index c2b51021f9..e75ce2e570 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc
+++ b/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/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
index 0a8fc1bc66..365bcb78cc 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
+++ b/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/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb
index a287e00eee..e11bcbc7cb 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb
+++ b/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_append_mtx-1 = " madwifi-modules"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
index ec7ca146d5..412c65dc06 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
+++ b/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_append_mtx-1 = " madwifi-modules"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb
index 7af73f085c..52eb62d848 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb
+++ b/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/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/packages/wpa-supplicant/wpa-supplicant_cvs.bb
index fd93eb8e54..db1395d76b 100644
--- a/packages/wpa-supplicant/wpa-supplicant_cvs.bb
+++ b/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/packages/wview/wview-common.inc b/packages/wview/wview-common.inc
index 0df0707718..c9bdc805b9 100644
--- a/packages/wview/wview-common.inc
+++ b/packages/wview/wview-common.inc
@@ -1,7 +1,6 @@
 SECTION = "apps"
 LICENSE = "GPL"
 DESCRIPTION = "wview is a weather site generator and more for a variety of weather stations"
-MAINTAINER = "Mark Teel (mark@teel.ws)"
 HOMEPAGE = "http://www.wviewweather.com/"
 DEPENDS += " bash util-linux gd openssl curl update-rc.d"
 
diff --git a/packages/xawtv/xawtv_3.93.bb b/packages/xawtv/xawtv_3.93.bb
index 068fc094b1..75bfa71e6d 100644
--- a/packages/xawtv/xawtv_3.93.bb
+++ b/packages/xawtv/xawtv_3.93.bb
@@ -3,7 +3,6 @@ SECTION = "x11/utils"
 DESCRIPTION = "XawTV is a simple Xaw-based TV program which uses the bttw \
 driver or video4linux.  It also contains various command-line utilities for \
 grabbing images and AVI movies, tuning in TV stations, etc."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "libxaw libxmu libxt libxpm libxext virtual/libx11 ncurses libxft fs jpeg"
 
 SRC_URI = "http://dl.bytesex.org/releases/xawtv/xawtv-${PV}.tar.gz \
diff --git a/packages/xcb/libxcb_0.9.91.bb b/packages/xcb/libxcb_0.9.91.bb
index 564ee33b5e..67b3d10496 100644
--- a/packages/xcb/libxcb_0.9.91.bb
+++ b/packages/xcb/libxcb_0.9.91.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PR = "r0"
 
 PARALLEL_MAKE = ""
diff --git a/packages/xcb/libxcb_0.9.92.bb b/packages/xcb/libxcb_0.9.92.bb
index 890dcb0dad..26eea1d576 100644
--- a/packages/xcb/libxcb_0.9.92.bb
+++ b/packages/xcb/libxcb_0.9.92.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PR = "r0"
 
 PARALLEL_MAKE = ""
diff --git a/packages/xcb/libxcb_0.9.bb b/packages/xcb/libxcb_0.9.bb
index 95ea4ab1a1..161e83ad11 100644
--- a/packages/xcb/libxcb_0.9.bb
+++ b/packages/xcb/libxcb_0.9.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PR = "r0"
 
 PARALLEL_MAKE = ""
diff --git a/packages/xcb/libxcb_git.bb b/packages/xcb/libxcb_git.bb
index 1ca23bc946..e6b42c1a31 100644
--- a/packages/xcb/libxcb_git.bb
+++ b/packages/xcb/libxcb_git.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PV = "0.9+git"
 PR = "r0"
 
diff --git a/packages/xcb/xcb-demo_0.1.bb b/packages/xcb/xcb-demo_0.1.bb
index 9f7ab023c6..c52b30feb7 100644
--- a/packages/xcb/xcb-demo_0.1.bb
+++ b/packages/xcb/xcb-demo_0.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PR = "r0"
 
 DEPENDS = "libxcb xcb-util"
diff --git a/packages/xcb/xcb-demo_git.bb b/packages/xcb/xcb-demo_git.bb
index 6a98d240a3..469f5f9042 100644
--- a/packages/xcb/xcb-demo_git.bb
+++ b/packages/xcb/xcb-demo_git.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PV = "0.1+git"
 PR = "r0"
 
diff --git a/packages/xcb/xcb-proto_0.9.91.bb b/packages/xcb/xcb-proto_0.9.91.bb
index 8373847b28..2c3c885627 100644
--- a/packages/xcb/xcb-proto_0.9.91.bb
+++ b/packages/xcb/xcb-proto_0.9.91.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PR = "r0"
 
 SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
diff --git a/packages/xcb/xcb-proto_0.9.92.bb b/packages/xcb/xcb-proto_0.9.92.bb
index 1d6258691e..f7f4160d5b 100644
--- a/packages/xcb/xcb-proto_0.9.92.bb
+++ b/packages/xcb/xcb-proto_0.9.92.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PR = "r0"
 
 SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
diff --git a/packages/xcb/xcb-proto_0.9.bb b/packages/xcb/xcb-proto_0.9.bb
index 481f2c5a25..853da9cc5a 100644
--- a/packages/xcb/xcb-proto_0.9.bb
+++ b/packages/xcb/xcb-proto_0.9.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PR = "r0"
 
 SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-0.9.tar.bz2"
diff --git a/packages/xcb/xcb-proto_git.bb b/packages/xcb/xcb-proto_git.bb
index 55b941a321..e7dcf61de1 100644
--- a/packages/xcb/xcb-proto_git.bb
+++ b/packages/xcb/xcb-proto_git.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PV = "0.9+git"
 PR = "r0"
 
diff --git a/packages/xcb/xcb-util_0.1.bb b/packages/xcb/xcb-util_0.1.bb
index 949d3db116..e7db2271ea 100644
--- a/packages/xcb/xcb-util_0.1.bb
+++ b/packages/xcb/xcb-util_0.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PR = "r0"
 
 DEPENDS = "libxcb"
diff --git a/packages/xcb/xcb-util_git.bb b/packages/xcb/xcb-util_git.bb
index 5e8c7d6536..9065c62d15 100644
--- a/packages/xcb/xcb-util_git.bb
+++ b/packages/xcb/xcb-util_git.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 PV = "0.1+git"
 PR = "r0"
 
diff --git a/packages/xchat/xchat_2.6.0.bb b/packages/xchat/xchat_2.6.0.bb
index 42807413a4..378a189db9 100644
--- a/packages/xchat/xchat_2.6.0.bb
+++ b/packages/xchat/xchat_2.6.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Full-featured IRC chat client with scripting support"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.xchat.org"
 SECTION = "x11/network"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libgcrypt zlib gtk+"
 PR = "r1"
 
diff --git a/packages/xchat/xchat_2.6.1.bb b/packages/xchat/xchat_2.6.1.bb
index bd40b7449c..ec058067c5 100644
--- a/packages/xchat/xchat_2.6.1.bb
+++ b/packages/xchat/xchat_2.6.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Full-featured IRC chat client with scripting support"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.xchat.org"
 SECTION = "x11/network"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libgcrypt zlib gtk+"
 PR = "r2"
 
diff --git a/packages/xcompmgr/xcompmgr_cvs.bb b/packages/xcompmgr/xcompmgr_cvs.bb
index 3979e430c0..2c1d6ae9f5 100644
--- a/packages/xcompmgr/xcompmgr_cvs.bb
+++ b/packages/xcompmgr/xcompmgr_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "x11"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "virtual/libx11 libxdamage libxcomposite libxrender"
 DESCRIPTION = "X Compositing Manager"
 
diff --git a/packages/xerces-c/xerces-c_2.6.0.bb b/packages/xerces-c/xerces-c_2.6.0.bb
index b38842951a..c76e3fc9b6 100644
--- a/packages/xerces-c/xerces-c_2.6.0.bb
+++ b/packages/xerces-c/xerces-c_2.6.0.bb
@@ -2,7 +2,6 @@ PR = "r0"
 DESCRIPTION = "Xerces-c xml"
 SECTION =  "libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Balister philip@balister.org"
 LICENSE = "MIT"
 
 
diff --git a/packages/xextensions/xextensions_1.0.1+cvs20050418.bb b/packages/xextensions/xextensions_1.0.1+cvs20050418.bb
index 2948da4a13..4c6bc4facc 100644
--- a/packages/xextensions/xextensions_1.0.1+cvs20050418.bb
+++ b/packages/xextensions/xextensions_1.0.1+cvs20050418.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "various extension headers."
 
 SRC_URI = "${XLIBS_CVS};module=XExtensions;date=20050418"
diff --git a/packages/xextensions/xextensions_1.0.1.bb b/packages/xextensions/xextensions_1.0.1.bb
index 134614bd0c..d776bfd54d 100644
--- a/packages/xextensions/xextensions_1.0.1.bb
+++ b/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/packages/xextensions/xextensions_20050610.bb b/packages/xextensions/xextensions_20050610.bb
index 00cea3bc85..728a6a0c92 100644
--- a/packages/xextensions/xextensions_20050610.bb
+++ b/packages/xextensions/xextensions_20050610.bb
@@ -3,7 +3,6 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "various extension headers."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XExtensions;date=${FIXEDSRCDATE}"
diff --git a/packages/xextensions/xextensions_cvs.bb b/packages/xextensions/xextensions_cvs.bb
index 18b95f5b00..36ced680af 100644
--- a/packages/xextensions/xextensions_cvs.bb
+++ b/packages/xextensions/xextensions_cvs.bb
@@ -1,7 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "various extension headers."
 
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XExtensions"
diff --git a/packages/xinetd/xinetd_2.3.13.bb b/packages/xinetd/xinetd_2.3.13.bb
index 4e67384d45..25a240dc4b 100644
--- a/packages/xinetd/xinetd_2.3.13.bb
+++ b/packages/xinetd/xinetd_2.3.13.bb
@@ -1,6 +1,5 @@
 DEPENDS = ""
 DESCRIPTION = "Highly configurable, modular and secure inetd"
-MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 PR="r4"
 
 SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
diff --git a/packages/xkbd/xkbd_0.8.15.bb b/packages/xkbd/xkbd_0.8.15.bb
index 7272c9d04d..2d070fd7ad 100644
--- a/packages/xkbd/xkbd_0.8.15.bb
+++ b/packages/xkbd/xkbd_0.8.15.bb
@@ -6,7 +6,6 @@ SRC_URI = "http://handhelds.org/~mallum/xkbd/xkbd-${PV}-CVS.tar.gz \
 LICENSE = "GPL"
 PR = "r2"
 
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11"
 DEPENDS = "libxpm libxtst libxft"
 
diff --git a/packages/xmms/xmms-mad_0.10.bb b/packages/xmms/xmms-mad_0.10.bb
index 6c43d7878f..b085632178 100644
--- a/packages/xmms/xmms-mad_0.10.bb
+++ b/packages/xmms/xmms-mad_0.10.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "xmms plugin for the mad integer mp3 decoder"
 SECTION = "x11/multimedia"
 HOMEPAGE = "http://xmms-mad.sourceforge.net
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>
 LICENSE = "GPL"
 DEPENDS = "xmms libmad libid3tag"
 SRC_URI = "${SOURCEFORGE_MIRROR}/xmms-mad/xmms-mad-${PV}.tar.bz2"
diff --git a/packages/xmms/xmms-tremor_1.0.bb b/packages/xmms/xmms-tremor_1.0.bb
index d6619d4d97..727ead1f80 100644
--- a/packages/xmms/xmms-tremor_1.0.bb
+++ b/packages/xmms/xmms-tremor_1.0.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "xmms plugin for the tremos integer vorbis decoder"
 SECTION = "x11/multimedia"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>
 LICENSE = "GPL"
 DEPENDS = "xmms tremor"
 SRC_URI = "http://mirror1.pdaxrom.org/source/src/xmms-tremor-1.0.tar.bz2"
diff --git a/packages/xorg-app/xauth_cvs.bb b/packages/xorg-app/xauth_cvs.bb
index a944d1d51d..169de7a797 100644
--- a/packages/xorg-app/xauth_cvs.bb
+++ b/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/packages/xorg-app/xdpyinfo_cvs.bb b/packages/xorg-app/xdpyinfo_cvs.bb
index df31ba68d5..9a05f066ce 100644
--- a/packages/xorg-app/xdpyinfo_cvs.bb
+++ b/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/packages/xorg-app/xev_X11R7.0-1.0.1.bb b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
index 20cb06c4cd..1969eb3c07 100644
--- a/packages/xorg-app/xev_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
 DESCRIPTION = "X Event Viewer"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 LICENSE = "MIT"
 
 DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xev_cvs.bb b/packages/xorg-app/xev_cvs.bb
index 8acf2261cb..95520f0e7a 100644
--- a/packages/xorg-app/xev_cvs.bb
+++ b/packages/xorg-app/xev_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 DESCRIPTION = "X Event Viewer"
 HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps"
 LICENSE = "MIT"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "x11/base"
 DEPENDS = "virtual/libx11 libxau"
 PR = "r1"
diff --git a/packages/xorg-app/xhost_20040413.bb b/packages/xorg-app/xhost_20040413.bb
index ed240dbba1..59e8f32964 100644
--- a/packages/xorg-app/xhost_20040413.bb
+++ b/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/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
index a08ad7184d..e997ffc6a6 100644
--- a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
+++ b/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/packages/xorg-app/xhost_X11R7.1-1.0.1.bb b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
index a08ad7184d..e997ffc6a6 100644
--- a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
+++ b/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/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
index b671beb07b..856aae8e6c 100644
--- a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
+++ b/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/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
index 4fe4c0c4cc..da12303b23 100644
--- a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
+++ b/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/packages/xorg-app/xmodmap_cvs.bb b/packages/xorg-app/xmodmap_cvs.bb
index 7f45b28a89..e2b3847e6b 100644
--- a/packages/xorg-app/xmodmap_cvs.bb
+++ b/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/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc
index 53aa991b9f..27a1dd2bfa 100644
--- a/packages/xorg-app/xorg-app-common.inc
+++ b/packages/xorg-app/xorg-app-common.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "X application"
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/apps"
-#MAINTAINER = ""
 LICENSE = "MIT-X"
 
 #DEPENDS = ""
diff --git a/packages/xorg-app/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb
index 6fb3cf4c59..1e36987358 100644
--- a/packages/xorg-app/xprop_cvs.bb
+++ b/packages/xorg-app/xprop_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 DEPENDS = "virtual/libx11 libxmu libxext"
 DESCRIPTION = "property displayer for X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 PR = "r2"
 
diff --git a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
index bad78d3873..65f08f2bb6 100644
--- a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
+++ b/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/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
index d73890cc15..24a5ac9208 100644
--- a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
+++ b/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/packages/xorg-app/xrdb_cvs.bb b/packages/xorg-app/xrdb_cvs.bb
index 51a3fcd08a..1289a8cfce 100644
--- a/packages/xorg-app/xrdb_cvs.bb
+++ b/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/packages/xorg-app/xset_20040817.bb b/packages/xorg-app/xset_20040817.bb
index 90247fdb26..3b91812b94 100644
--- a/packages/xorg-app/xset_20040817.bb
+++ b/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/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
index b8b204e657..72c315c6a1 100644
--- a/packages/xorg-app/xset_X11R7.0-1.0.1.bb
+++ b/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/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/packages/xorg-app/xset_X11R7.1-1.0.2.bb
index b8b204e657..72c315c6a1 100644
--- a/packages/xorg-app/xset_X11R7.1-1.0.2.bb
+++ b/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/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb
index 03b9b3873c..269cccc733 100644
--- a/packages/xorg-app/xterm_207.bb
+++ b/packages/xorg-app/xterm_207.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "xterm app"
 SECTION = "x11/apps"
-#MAINTAINER = ""
 LICENSE = "MIT-X"
 
 DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau xpm ncurses"
diff --git a/packages/xorg-data/xorg-data-common.inc b/packages/xorg-data/xorg-data-common.inc
index 095bc095fc..9b236c852f 100644
--- a/packages/xorg-data/xorg-data-common.inc
+++ b/packages/xorg-data/xorg-data-common.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "X data files"
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/datas"
-#MAINTAINER = ""
 LICENSE = "MIT-X"
 
 #DEPENDS = ""
diff --git a/packages/xorg-doc/xorg-doc-common.inc b/packages/xorg-doc/xorg-doc-common.inc
index 3be252d076..de47e60df1 100644
--- a/packages/xorg-doc/xorg-doc-common.inc
+++ b/packages/xorg-doc/xorg-doc-common.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "X documentation"
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/docs"
-#MAINTAINER = ""
 LICENSE = "MIT-X"
 
 #DEPENDS = ""
diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc
index 6d8204b9b1..4f36f2be17 100644
--- a/packages/xorg-driver/xorg-driver-common.inc
+++ b/packages/xorg-driver/xorg-driver-common.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "X driver"
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/drivers"
-#MAINTAINER = ""
 LICENSE = "MIT-X"
 
 DEPENDS = "randrproto xorg-server xproto"
diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc
index 8a6bd0b475..137ee0917f 100644
--- a/packages/xorg-font/xorg-font-common.inc
+++ b/packages/xorg-font/xorg-font-common.inc
@@ -1,6 +1,5 @@
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/fonts"
-#MAINTAINER = ""
 LICENSE = "MIT-X"
 
 DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native"
diff --git a/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb b/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb
index cecd14f57f..f410b5d94e 100644
--- a/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X fontenc library (used by libxfont)."
 SECTION = "x11/libs"
 PRIORITY = "optional"
-#MAINTAINER = ""
 LICENSE = "BSD-X"
 
 DEPENDS = "zlib-native xproto-native"
diff --git a/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb b/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb
index 0ccc8dd3d3..5a3febbca8 100644
--- a/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb
+++ b/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X libfontenc library (used by libxfont)."
 SECTION = "x11/libs"
 PRIORITY = "optional"
-#MAINTAINER = ""
 LICENSE = "BSD-X"
 
 DEPENDS = "zlib-native xproto-native"
diff --git a/packages/xorg-lib/libice_6.3.3.bb b/packages/xorg-lib/libice_6.3.3.bb
index e771161e59..3bbea635ee 100644
--- a/packages/xorg-lib/libice_6.3.3.bb
+++ b/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/packages/xorg-lib/libsm_6.0.3.bb b/packages/xorg-lib/libsm_6.0.3.bb
index cd374649bb..620e4d8295 100644
--- a/packages/xorg-lib/libsm_6.0.3.bb
+++ b/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/packages/xorg-lib/libx11_6.2.1.bb b/packages/xorg-lib/libx11_6.2.1.bb
index ce57c42f7f..4e160ad286 100644
--- a/packages/xorg-lib/libx11_6.2.1.bb
+++ b/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/packages/xorg-lib/libx11_cvs.bb b/packages/xorg-lib/libx11_cvs.bb
index aaa052eba3..7b89c668dc 100644
--- a/packages/xorg-lib/libx11_cvs.bb
+++ b/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/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb
index 553c3aeacf..0e28057d82 100644
--- a/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/libs"
 PRIORITY = "optional"
-#MAINTAINER = ""
 LICENSE = "BSD-X"
 
 DEPENDS = "xproto-native util-macros-native"
diff --git a/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb
index c0a3ea802f..617ee7e6b3 100644
--- a/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/libs"
 PRIORITY = "optional"
-#MAINTAINER = ""
 LICENSE = "BSD-X"
 
 DEPENDS = "xproto-native util-macros-native"
diff --git a/packages/xorg-lib/libxau_0.1.1.bb b/packages/xorg-lib/libxau_0.1.1.bb
index dc1a28171b..ef5eb9662e 100644
--- a/packages/xorg-lib/libxau_0.1.1.bb
+++ b/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/packages/xorg-lib/libxau_cvs.bb b/packages/xorg-lib/libxau_cvs.bb
index 518744816d..787bc290e7 100644
--- a/packages/xorg-lib/libxau_cvs.bb
+++ b/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/packages/xorg-lib/libxaw_7.0.2.bb b/packages/xorg-lib/libxaw_7.0.2.bb
index 04f2855101..b55f2b8309 100644
--- a/packages/xorg-lib/libxaw_7.0.2.bb
+++ b/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/packages/xorg-lib/libxcursor_1.1.2.bb b/packages/xorg-lib/libxcursor_1.1.2.bb
index 25744c7dca..156bd80f08 100644
--- a/packages/xorg-lib/libxcursor_1.1.2.bb
+++ b/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/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb
index fbbf8e9117..d34088a255 100644
--- a/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/libs"
 PRIORITY = "optional"
-#MAINTAINER = ""
 LICENSE = "BSD-X"
 
 DEPENDS = "xproto-native util-macros-native"
diff --git a/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb
index 8ab69a1d41..12b5bbe905 100644
--- a/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb
@@ -1,6 +1,5 @@
 SECTION = "x11/libs"
 PRIORITY = "optional"
-#MAINTAINER = ""
 LICENSE = "BSD-X"
 
 DEPENDS = "xproto-native util-macros-native"
diff --git a/packages/xorg-lib/libxdmcp_0.1.1.bb b/packages/xorg-lib/libxdmcp_0.1.1.bb
index 19fba1529e..1fa11acaa5 100644
--- a/packages/xorg-lib/libxdmcp_0.1.1.bb
+++ b/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/packages/xorg-lib/libxdmcp_0.1.3.bb b/packages/xorg-lib/libxdmcp_0.1.3.bb
index aa2736cdb2..20c4e5bd0c 100644
--- a/packages/xorg-lib/libxdmcp_0.1.3.bb
+++ b/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/packages/xorg-lib/libxdmcp_cvs.bb b/packages/xorg-lib/libxdmcp_cvs.bb
index 20b957b522..8f0833b402 100644
--- a/packages/xorg-lib/libxdmcp_cvs.bb
+++ b/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/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb
index 93aac77f7b..f49c207637 100644
--- a/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X font library (used by the X server)."
 SECTION = "x11/libs"
 PRIORITY = "optional"
-#MAINTAINER = ""
 LICENSE = "BSD-X"
 
 DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native"
diff --git a/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb
index 664f9440a4..e4d721dfe4 100644
--- a/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb
+++ b/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X font library (used by the X server)."
 SECTION = "x11/libs"
 PRIORITY = "optional"
-#MAINTAINER = ""
 LICENSE = "BSD-X"
 
 DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native"
diff --git a/packages/xorg-lib/libxfont_1.4.2.bb b/packages/xorg-lib/libxfont_1.4.2.bb
index 0cc45397fe..6053762a4e 100644
--- a/packages/xorg-lib/libxfont_1.4.2.bb
+++ b/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/packages/xorg-lib/libxfont_cvs.bb b/packages/xorg-lib/libxfont_cvs.bb
index bd21e0fd12..d96fd87964 100644
--- a/packages/xorg-lib/libxfont_cvs.bb
+++ b/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/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
index eb4a6d54cf..36d05f77ce 100644
--- a/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
+++ b/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/packages/xorg-lib/libxinerama_1.0.2.bb b/packages/xorg-lib/libxinerama_1.0.2.bb
index 429c2fc4d0..3a3594c3ed 100644
--- a/packages/xorg-lib/libxinerama_1.0.2.bb
+++ b/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/packages/xorg-lib/libxpm_3.5.1.bb b/packages/xorg-lib/libxpm_3.5.1.bb
index 8447cd3630..4e63c15ef9 100644
--- a/packages/xorg-lib/libxpm_3.5.1.bb
+++ b/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/packages/xorg-lib/libxpm_cvs.bb b/packages/xorg-lib/libxpm_cvs.bb
index 4d4d534e9a..df3e5f3c72 100644
--- a/packages/xorg-lib/libxpm_cvs.bb
+++ b/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/packages/xorg-lib/libxres_1.0.1.bb b/packages/xorg-lib/libxres_1.0.1.bb
index 3f0d32bfe4..58943c467e 100644
--- a/packages/xorg-lib/libxres_1.0.1.bb
+++ b/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/packages/xorg-lib/libxres_cvs.bb b/packages/xorg-lib/libxres_cvs.bb
index a457d6c14f..02e023ee76 100644
--- a/packages/xorg-lib/libxres_cvs.bb
+++ b/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/packages/xorg-lib/libxt_0.1.5.bb b/packages/xorg-lib/libxt_0.1.5.bb
index 9c31075285..b0d2d230d3 100644
--- a/packages/xorg-lib/libxt_0.1.5.bb
+++ b/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/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc
index 8e5ba5874f..ed3b5f0063 100644
--- a/packages/xorg-lib/xorg-lib-common.inc
+++ b/packages/xorg-lib/xorg-lib-common.inc
@@ -1,6 +1,5 @@
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/libs"
-#MAINTAINER = ""
 LICENSE = "MIT-X"
 
 DEPENDS = "util-macros"
diff --git a/packages/xorg-lib/xtrans_0.1.bb b/packages/xorg-lib/xtrans_0.1.bb
index 8fee0d5089..f3fa0ddc38 100644
--- a/packages/xorg-lib/xtrans_0.1.bb
+++ b/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/packages/xorg-lib/xtrans_cvs.bb b/packages/xorg-lib/xtrans_cvs.bb
index 9714f4017b..73a0e4b8e1 100644
--- a/packages/xorg-lib/xtrans_cvs.bb
+++ b/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/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
index 9b9cc8e472..f46c1da93e 100644
--- a/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
+++ b/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/bigreqsproto-${PV}.tar.bz2"
 S = "${WORKDIR}/bigreqsproto-${PV}"
diff --git a/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
index 062c6ccbb9..a9ff843cb3 100644
--- a/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
+++ b/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontcacheproto-${PV}.tar.bz2"
 S = "${WORKDIR}/fontcacheproto-${PV}"
diff --git a/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
index 3c5356f0df..34a32f97be 100644
--- a/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
+++ b/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontsproto-${PV}.tar.bz2"
 S = "${WORKDIR}/fontsproto-${PV}"
diff --git a/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
index c89ec23505..c47701289d 100644
--- a/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
+++ b/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/inputproto-${PV}.tar.bz2"
 S = "${WORKDIR}/inputproto-${PV}"
diff --git a/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
index 983730ecc0..e7d1f9c992 100644
--- a/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
+++ b/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/kbproto-${PV}.tar.bz2"
 S = "${WORKDIR}/kbproto-${PV}"
diff --git a/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
index af35684479..1ccfc89032 100644
--- a/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
+++ b/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xcmiscproto-${PV}.tar.bz2"
 S = "${WORKDIR}/xcmiscproto-${PV}"
diff --git a/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
index 0c1fda0e16..50d6c5b2e9 100644
--- a/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
+++ b/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/protto/xextproto-${PV}.tar.bz2"
 S = "${WORKDIR}/xextproto-${PV}"
diff --git a/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
index 3fa9c9522c..e37d738633 100644
--- a/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
+++ b/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xf86bigfontproto-${PV}.tar.bz2"
 S = "${WORKDIR}/xf86bigfontproto-${PV}"
diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc
index 4d189235f4..017e8755a8 100644
--- a/packages/xorg-proto/xorg-proto-common.inc
+++ b/packages/xorg-proto/xorg-proto-common.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "X protocol headers"
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/libs"
-#MAINTAINER = ""
 LICENSE = "MIT-X"
 
 #DEPENDS = ""
diff --git a/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb
index c197c87298..34a74b77e8 100644
--- a/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb
+++ b/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xproto-${PV}.tar.bz2"
 S = "${WORKDIR}/xproto-${PV}"
diff --git a/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb
index 8cec6426fd..80ddcd7e6e 100644
--- a/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb
+++ b/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.1/src/proto/xproto-${PV}.tar.bz2"
 S = "${WORKDIR}/xproto-${PV}"
diff --git a/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb b/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
index 594a351155..55bc32b768 100644
--- a/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
+++ b/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/packages/xorg-proto/xproto_6.6.2.bb b/packages/xorg-proto/xproto_6.6.2.bb
index b5cf751053..1f01c0979a 100644
--- a/packages/xorg-proto/xproto_6.6.2.bb
+++ b/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/packages/xorg-proto/xproto_cvs.bb b/packages/xorg-proto/xproto_cvs.bb
index 1d9c96c87d..f42fa1bb43 100644
--- a/packages/xorg-proto/xproto_cvs.bb
+++ b/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/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb b/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb
index 8696ae62f8..dcfc7ebaee 100644
--- a/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb
+++ b/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X autotools macros"
 SECTION = "x11/libs"
 LICENSE= "Xorg"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/util-macros-${PV}.tar.bz2"
 S = "${WORKDIR}/util-macros-${PV}"
diff --git a/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb b/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
index 1506bd3cb2..239750bb80 100644
--- a/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
+++ b/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "X autotools macros"
 SECTION = "x11/libs"
 LICENSE= "Xorg"
-#MAINTAINER = ""
 
 SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/util-macros-${PV}.tar.bz2"
 S = "${WORKDIR}/util-macros-${PV}"
diff --git a/packages/xorg-util/xorg-util-common.inc b/packages/xorg-util/xorg-util-common.inc
index 93750f3757..f6e9c65b78 100644
--- a/packages/xorg-util/xorg-util-common.inc
+++ b/packages/xorg-util/xorg-util-common.inc
@@ -1,6 +1,5 @@
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/utils"
-#MAINTAINER = ""
 LICENSE = "MIT-X"
 
 #DEPENDS = ""
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 9455e5063c..27e9a8d73a 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -1,6 +1,5 @@
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/base"
-#MAINTAINER = ""
 LICENSE = "MIT-X"
 
 RPROVIDES = "virtual/xserver"
diff --git a/packages/xournal/xournal_0.2.bb b/packages/xournal/xournal_0.2.bb
index 71299513e9..6a4b6839b4 100644
--- a/packages/xournal/xournal_0.2.bb
+++ b/packages/xournal/xournal_0.2.bb
@@ -1,6 +1,5 @@
 HOMEPAGE = "http://xournal.sf.net/"
 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/packages/xournal/xournal_0.3.1.bb b/packages/xournal/xournal_0.3.1.bb
index 3ab60725d6..077036b686 100644
--- a/packages/xournal/xournal_0.3.1.bb
+++ b/packages/xournal/xournal_0.3.1.bb
@@ -1,6 +1,5 @@
 HOMEPAGE = "http://xournal.sf.net/"
 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/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb
index 64c223f109..fecdfbc8a3 100644
--- a/packages/xserver-common/xserver-common_1.10.bb
+++ b/packages/xserver-common/xserver-common_1.10.bb
@@ -1,4 +1,3 @@
-MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xserver-common/xserver-common_1.3.bb
index ea3fab6654..8980ae2f9f 100644
--- a/packages/xserver-common/xserver-common_1.3.bb
+++ b/packages/xserver-common/xserver-common_1.3.bb
@@ -1,4 +1,3 @@
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb
index b7b3f554f3..9e9c9d2e5e 100644
--- a/packages/xserver-common/xserver-common_1.8.bb
+++ b/packages/xserver-common/xserver-common_1.8.bb
@@ -1,4 +1,3 @@
-MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xserver-common/xserver-common_1.9.bb
index de81537f99..15428b0797 100644
--- a/packages/xserver-common/xserver-common_1.9.bb
+++ b/packages/xserver-common/xserver-common_1.9.bb
@@ -1,4 +1,3 @@
-MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
diff --git a/packages/xstroke/xstroke_0.6.bb b/packages/xstroke/xstroke_0.6.bb
index ca4afd2e6b..24c03b633c 100644
--- a/packages/xstroke/xstroke_0.6.bb
+++ b/packages/xstroke/xstroke_0.6.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Gesture recognition input method for X11"
 LICENSE = "GPL"
 SECTION = "x11"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "virtual/libx11 xft libxtst libxpm"
 PR = "r2"
 
diff --git a/packages/xtscal/xtscal_0.4.bb b/packages/xtscal/xtscal_0.4.bb
index f2008506b5..60ad48eaa3 100644
--- a/packages/xtscal/xtscal_0.4.bb
+++ b/packages/xtscal/xtscal_0.4.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Touchscreen calibration utility"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11/base"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxft libxrandr"
diff --git a/packages/xtscal/xtscal_0.5.1.bb b/packages/xtscal/xtscal_0.5.1.bb
index ff0346f9d9..33dcfe1d80 100644
--- a/packages/xtscal/xtscal_0.5.1.bb
+++ b/packages/xtscal/xtscal_0.5.1.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Touchscreen calibration utility"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11/base"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate"
diff --git a/packages/xtscal/xtscal_0.5.bb b/packages/xtscal/xtscal_0.5.bb
index 8f5a62c980..220c262a9f 100644
--- a/packages/xtscal/xtscal_0.5.bb
+++ b/packages/xtscal/xtscal_0.5.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Touchscreen calibration utility"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11/base"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxft libxrandr xcalibrate"
diff --git a/packages/xtscal/xtscal_0.6.3.bb b/packages/xtscal/xtscal_0.6.3.bb
index 682ed2258a..443b487065 100644
--- a/packages/xtscal/xtscal_0.6.3.bb
+++ b/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 = "virtual/libx11 libxft libxrandr xcalibrate"
diff --git a/packages/zauralign/zauralign_1.0.2.bb b/packages/zauralign/zauralign_1.0.2.bb
index 41ef0e1f25..75f565816b 100644
--- a/packages/zauralign/zauralign_1.0.2.bb
+++ b/packages/zauralign/zauralign_1.0.2.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Zauralign - a game for one player. The player has to align pieces
 board fighting against new pieces which appear after each move." 
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.Vanille.de/mirror/zauralign-${PV}.tar.gz"
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index 09a8800a7a..f650126c58 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Daemon to handle device specifc features."
 SECTION = "base"
-MAINTAINER = "Richard Purdie <rpurdie@openedhand.com>"
 LICENSE = "GPL"
 DEPENDS = "tslib"
 RDEPENDS = "procps"
diff --git a/packages/zbedic/libbedic_1.0.bb b/packages/zbedic/libbedic_1.0.bb
index 8d0ead686d..4ffb13cee0 100644
--- a/packages/zbedic/libbedic_1.0.bb
+++ b/packages/zbedic/libbedic_1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}/zbedic/misc"
diff --git a/packages/zbedic/zbedic_1.0.bb b/packages/zbedic/zbedic_1.0.bb
index 4290258b61..afdfdd5350 100644
--- a/packages/zbedic/zbedic_1.0.bb
+++ b/packages/zbedic/zbedic_1.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 DEPENDS = "libbedic"
 APPTYPE = "binary"
diff --git a/packages/zbench/zbench_2.0.bb b/packages/zbench/zbench_2.0.bb
index 336a4e9a82..0e24f980a0 100644
--- a/packages/zbench/zbench_2.0.bb
+++ b/packages/zbench/zbench_2.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Benchmark for Opie/Qtopia"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.aa.alpha-net.ne.jp/satoshic/dw_zbnch.htm"
 PR = "r1"
diff --git a/packages/zd1211/zd1211_r77.bb b/packages/zd1211/zd1211_r77.bb
index c4551a97d8..7214671de0 100644
--- a/packages/zd1211/zd1211_r77.bb
+++ b/packages/zd1211/zd1211_r77.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
 PR = "r3"
 RDEPENDS = "wireless-tools"
diff --git a/packages/zd1211/zd1211_r83.bb b/packages/zd1211/zd1211_r83.bb
index 2a560bada5..d0d875c842 100644
--- a/packages/zd1211/zd1211_r83.bb
+++ b/packages/zd1211/zd1211_r83.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
 HOMEPAGE = "http://zd1211.ath.cx/"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
 RDEPENDS = "wireless-tools"
 PR = "r1"
diff --git a/packages/zddice/zddice_1.0.0.bb b/packages/zddice/zddice_1.0.0.bb
index 2a58a0a332..068c39c3a9 100644
--- a/packages/zddice/zddice_1.0.0.bb
+++ b/packages/zddice/zddice_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Zaurus D20 Gaming Dice for Qt/Embedded based Palmtop Environments"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/zeecookbook/zeecookbook_1.1.bb b/packages/zeecookbook/zeecookbook_1.1.bb
index c5996f701f..1964af1eea 100644
--- a/packages/zeecookbook/zeecookbook_1.1.bb
+++ b/packages/zeecookbook/zeecookbook_1.1.bb
@@ -6,7 +6,6 @@ SECTION = "opie/applications"
 DEPENDS = "sqlite"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Philip Frampton"
 PR = "r0"
 
 SRC_URI = "http://sf.gds.tuwien.ac.at/z/ze/zeecookbook/zeecookbook-1.1.zip \
diff --git a/packages/zgscore/zgscore_1.0.2.bb b/packages/zgscore/zgscore_1.0.2.bb
index 262902ce2f..967791e53f 100644
--- a/packages/zgscore/zgscore_1.0.2.bb
+++ b/packages/zgscore/zgscore_1.0.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Zaurus Golf Score Application for Qt/Embedded based Palmtop Environments"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://nuke.cinlug.org/modules/Static_Docs/data/db/zgs/"
 PR = "r0"
diff --git a/packages/zile/zile_1.7+2.0beta6.bb b/packages/zile/zile_1.7+2.0beta6.bb
index 1a4f7955fb..74d832eef3 100644
--- a/packages/zile/zile_1.7+2.0beta6.bb
+++ b/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/packages/zile/zile_2.2.15.bb b/packages/zile/zile_2.2.15.bb
index ca6ced7b18..72284629a7 100644
--- a/packages/zile/zile_2.2.15.bb
+++ b/packages/zile/zile_2.2.15.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Zile is lossy Emacs."
 HOMEPAGE = "http://zile.sourceforge.net/"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "console/editors"
 PR = "r0"
 
diff --git a/packages/zipsc/zipsc_0.4.3.bb b/packages/zipsc/zipsc_0.4.3.bb
index c253cfb468..178d3a0ea2 100644
--- a/packages/zipsc/zipsc_0.4.3.bb
+++ b/packages/zipsc/zipsc_0.4.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "IP/Subnet calculator for Qt/Embedded based Palmtop Environments"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.warmi.net/zaurus/zipsc.shtml"
 PR = "r1"
diff --git a/packages/zlapspeed/zlapspeed_1.0.0.bb b/packages/zlapspeed/zlapspeed_1.0.0.bb
index cb4b5e5d83..a419d9d2ab 100644
--- a/packages/zlapspeed/zlapspeed_1.0.0.bb
+++ b/packages/zlapspeed/zlapspeed_1.0.0.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Zaurus Race Lap Speed Measuring Application for Qt/Embedded based Palmtop Environments"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.cinlug.org/modules/Static_Docs/data/db/zlaps/zlaps_${PV}_arm.src.tar.gz \
diff --git a/packages/zlib/zlib_1.1.4.bb b/packages/zlib/zlib_1.1.4.bb
index 86066e77f5..768b1bc91a 100644
--- a/packages/zlib/zlib_1.1.4.bb
+++ b/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/packages/zlib/zlib_1.2.2.bb b/packages/zlib/zlib_1.2.2.bb
index 08c97c2f25..1f543f04b4 100644
--- a/packages/zlib/zlib_1.2.2.bb
+++ b/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/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb
index 507b32eff9..571f7b5e08 100644
--- a/packages/zlib/zlib_1.2.3.bb
+++ b/packages/zlib/zlib_1.2.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Zlib Compression Library"
 SECTION = "libs"
 PRIORITY = "required"
-MAINTAINER = "Henning Heinold <heinold@inf.fu-berlin.de>"
 HOMEPAGE = "http://www.gzip.org/zlib/"
 LICENSE = "zlib"
 PR="r1"
diff --git a/packages/zmerlin/zmerlin_0.9.1.bb b/packages/zmerlin/zmerlin_0.9.1.bb
index fc51b48ac9..43e94a5d28 100644
--- a/packages/zmerlin/zmerlin_0.9.1.bb
+++ b/packages/zmerlin/zmerlin_0.9.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Puzzle Game for Qt/Embedded based palmtop environments."
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/zope/zope_2.7.1.bb b/packages/zope/zope_2.7.1.bb
index 29beb54600..37e2dff716 100644
--- a/packages/zope/zope_2.7.1.bb
+++ b/packages/zope/zope_2.7.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A full fledged pluggable content management system with integrated web server and much more"
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "python"
 RDEPENDS = "python-core python-shell"
 LICENSE = "ZPL"
diff --git a/packages/zope/zope_2.9.2.bb b/packages/zope/zope_2.9.2.bb
index 60aa2dfeb2..e1409aed24 100644
--- a/packages/zope/zope_2.9.2.bb
+++ b/packages/zope/zope_2.9.2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A full fledged pluggable content management system with integrated web server and much more."
 SECTION = "console/network"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "python"
 RDEPENDS = "python-core python-shell"
 LICENSE = "ZPL"
diff --git a/packages/zrally/zrally_0.90.bb b/packages/zrally/zrally_0.90.bb
index 8d9c06536f..ecf3fcf9fc 100644
--- a/packages/zrally/zrally_0.90.bb
+++ b/packages/zrally/zrally_0.90.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "ZRally is a top view race game which offers the player mulitple \
 tracks and multiple skill levels."
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Kevin Greenhaw <kevin_greenhaw@email.com>"
 HOMEPAGE = "http://zrally.sourceforge.net/zrally.html"
diff --git a/packages/zroadmap/zroadmap_1.0.12.bb b/packages/zroadmap/zroadmap_1.0.12.bb
index 727a41664b..2df5c32d08 100644
--- a/packages/zroadmap/zroadmap_1.0.12.bb
+++ b/packages/zroadmap/zroadmap_1.0.12.bb
@@ -7,7 +7,6 @@ direction, speed, etc..). Voice messages are generated that duplicate some of th
 SECTION = "opie/applications"
 PRIORITY = "optional"
 AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
 LICENSE = "GPL"
 PR = "r0"
diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb
index a8af031638..a9a8bd87f8 100644
--- a/packages/zroadmap/zroadmap_cvs.bb
+++ b/packages/zroadmap/zroadmap_cvs.bb
@@ -5,7 +5,6 @@ of the crossing street at the next intersection."
 SECTION = "opie/applications"
 PRIORITY = "optional"
 AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
 DEPENDS = "popt expat"
 LICENSE = "GPL"
diff --git a/packages/zsafe/zsafe_2.1.3.bb b/packages/zsafe/zsafe_2.1.3.bb
index f4b9d0c5ab..80d0392b76 100644
--- a/packages/zsafe/zsafe_2.1.3.bb
+++ b/packages/zsafe/zsafe_2.1.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Password manager"
 SECTION     = "opie/applications"
 PRIORITY    = "optional"
-MAINTAINER  = "Carsten Schneider <zcarsten@gmx.net>"
 LICENSE     = "GPL"
 RCONFLICTS  = "opie-zsafe"
 APPNAME     = "zsafe"
diff --git a/packages/zsh/zsh_4.1.1.bb b/packages/zsh/zsh_4.1.1.bb
index e59a42c174..3c5cc85b83 100644
--- a/packages/zsh/zsh_4.1.1.bb
+++ b/packages/zsh/zsh_4.1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "The Zsh shell"
 SECTION = "base/shell"
 PRIORITY = "optional"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "ncurses libpcre"
 PR = "r2"
 LICENSE = "zsh"
diff --git a/packages/zshopi/zshopi_0.2.bb b/packages/zshopi/zshopi_0.2.bb
index db49069934..61b92e2c1c 100644
--- a/packages/zshopi/zshopi_0.2.bb
+++ b/packages/zshopi/zshopi_0.2.bb
@@ -3,7 +3,6 @@ SECTION = "opie/applications"
 DEPENDS = "sqlite opie-lrelease-native"
 PRIORITY = "optional"
 LICENSE = "GPL"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 HOMEPAGE = "http://www.lachner-net.de/"
 AUTHOR = "Bernd Lachner <dev@lachner-net.de>"
 APPTYPE = "binary"
diff --git a/packages/ztappy/ztappy_0.9.1.bb b/packages/ztappy/ztappy_0.9.1.bb
index 5edeb676d3..3841b4a0f2 100644
--- a/packages/ztappy/ztappy_0.9.1.bb
+++ b/packages/ztappy/ztappy_0.9.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Puzzle Game for Qt/Embedded based palmtop environments."
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/zuc/zuc_1.1.2ern.bb b/packages/zuc/zuc_1.1.2ern.bb
index f80a19e13e..32c8f9848d 100644
--- a/packages/zuc/zuc_1.1.2ern.bb
+++ b/packages/zuc/zuc_1.1.2ern.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A Unit Conversion Tool"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 APPTYPE = "binary"
 APPNAME = "zuc"