2 files changed, 2 insertions, 2 deletions

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a4a3c754b9..228c8706e4 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -91,7 +91,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DESCRIPTION = "Version ${PV}-${PR} of package ${PN}"
 LICENSE = "unknown"
-MAINTAINER = "OpenEmbedded Team <oe@handhelds.org>"
+MAINTAINER = "OpenedHand <poky@openedhand.com>"
 HOMEPAGE = "unknown"
 
 # Package dependencies and provides.
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index ee3ec0680f..00261aa9ab 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -7,7 +7,7 @@ DISTRO_VERSION = "0.0-snapshot-${DATE}"
 
 DISTRO_TYPE ?= "release"
 
-MAINTAINER_poky = "OpenedHand <poky@openedhand.com>"
+MAINTAINER = "OpenedHand <poky@openedhand.com>"
 
 INHERIT += " package_ipk debian multimachine poky devshell "
 # For some reason, this doesn't work