diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 13c8f86a62..abd2bb5cfa 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -171,7 +171,7 @@ DESCRIPTION_${PN}-dbg ?= "${SUMMARY_${PN}-dbg}"
 DESCRIPTION_${PN}-dev ?= "${SUMMARY_${PN}-dev}"
 DESCRIPTION_${PN}-doc ?= "${SUMMARY_${PN}-doc}"
 LICENSE = "INVALID"
-MAINTAINER = "Poky Team <poky@openedhand.com>"
+MAINTAINER = "Yocto Project Team <poky@yoctoproject.org>"
 HOMEPAGE = "unknown"
 
 # Package dependencies and provides.
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 561d2840e3..b0b570cdd2 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -1,11 +1,11 @@
 #@TYPE: Distribution#@NAME: Poky
-#@DESCRIPTION: Distribution configuration for OpenedHand (Poky)
+#@DESCRIPTION: Distribution configuration for the Yocto Project build by Poky
 
 DISTRO = "poky"
-DISTRO_NAME = "OpenedHand Linux (Poky)"
-DISTRO_VERSION = "3.3+snapshot-${DATE}"
+DISTRO_NAME = "Yocto (Built by Poky 4.0)"
+DISTRO_VERSION = "0.9+snapshot-${DATE}"
 
-MAINTAINER = "Poky <poky@openedhand.com>"
+MAINTAINER = "Poky <poky@yoctoproject.org>"
 
 USER_CLASSES ?= ""