diff --git a/meta-openmoko/conf/distro/include/meta-openmoko-scm-revisions.inc b/meta-openmoko/conf/distro/include/meta-openmoko-scm-revisions.inc
new file mode 100644
index 0000000000..ec6bd224dc
--- /dev/null
+++ b/meta-openmoko/conf/distro/include/meta-openmoko-scm-revisions.inc
@@ -0,0 +1,38 @@
+#meta-openmoko
+SRCREV_pn-dfu-util-native ?= "3139"
+SRCREV_pn-dfu-util ?= "3139"
+SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
+SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
+SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
+SRCREV_pn-libmokogsmd2 ?= "4334"
+SRCREV_pn-libmokojournal2 ?= "3473"
+SRCREV_pn-libmokopanelui2 ?= "3349"
+SRCREV_pn-libmokoui2 ?= "4342"
+SRCREV_pn-moko-gtk-engine ?= "3612"
+SRCREV_pn-openmoko-alsa-scenarios ?= "4406"
+SRCREV_pn-openmoko-appearance ?= "3262"
+SRCREV_pn-openmoko-appmanager2 ?= "3442"
+SRCREV_pn-openmoko-browser2 ?= "4172"
+SRCREV_pn-openmoko-calculator2 ?= "3655"
+SRCREV_pn-openmoko-common2 ?= "3259"
+SRCREV_pn-openmoko-contacts2 ?= "418"
+SRCREV_pn-openmoko-dates2 ?= "673"
+SRCREV_pn-openmoko-dialer2 ?= "4448"
+SRCREV_pn-openmoko-panel-gsm ?= "4335"
+SRCREV_pn-openmoko-dialer3 ?= "111"
+SRCREV_pn-openmoko-feedreader2 ?= "3645"
+SRCREV_pn-openmoko-firststart2 ?= "3158"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "4232"
+SRCREV_pn-openmoko-mediaplayer2 ?= "4173"
+SRCREV_pn-openmoko-messages2 ?= "4340"
+SRCREV_pn-openmoko-sample2 ?= "3537"
+SRCREV_pn-openmoko-sound-theme-standard2 ?= "4271"
+SRCREV_pn-openmoko-tasks2 ?= "403"
+SRCREV_pn-openmoko-terminal2 ?= "4039"
+SRCREV_pn-openmoko-theme-standard2 ?= "4338"
+SRCREV_pn-openmoko-today2-folders ?= "3704"
+SRCREV_pn-openmoko-today2 ?= "4168"
+SRCREV_pn-openmoko-worldclock2 ?= "3365"
+SRCREV_pn-usbpath-native = "3172"
+SRCREV_pn-usbpath = "3172"
+
diff --git a/meta-openmoko/conf/layer.conf b/meta-openmoko/conf/layer.conf
new file mode 100644
index 0000000000..1dadce0cb6
--- /dev/null
+++ b/meta-openmoko/conf/layer.conf
@@ -0,0 +1,11 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH := "${BBPATH}${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
+
+BBFILE_COLLECTIONS += "openmoko"
+BBFILE_PATTERN_moblin := "^${LAYERDIR}/"
+BBFILE_PRIORITY_moblin = "5"
+
+require conf/distro/include/meta-openmoko-scm-revisions.inc
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 7646996edd..72dcdcf564 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -2,43 +2,6 @@
 #
 
 
-#meta-openmoko
-SRCREV_pn-dfu-util-native ?= "3139"
-SRCREV_pn-dfu-util ?= "3139"
-SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
-SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
-SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
-SRCREV_pn-libmokogsmd2 ?= "4334"
-SRCREV_pn-libmokojournal2 ?= "3473"
-SRCREV_pn-libmokopanelui2 ?= "3349"
-SRCREV_pn-libmokoui2 ?= "4342"
-SRCREV_pn-moko-gtk-engine ?= "3612"
-SRCREV_pn-openmoko-alsa-scenarios ?= "4406"
-SRCREV_pn-openmoko-appearance ?= "3262"
-SRCREV_pn-openmoko-appmanager2 ?= "3442"
-SRCREV_pn-openmoko-browser2 ?= "4172"
-SRCREV_pn-openmoko-calculator2 ?= "3655"
-SRCREV_pn-openmoko-common2 ?= "3259"
-SRCREV_pn-openmoko-contacts2 ?= "418"
-SRCREV_pn-openmoko-dates2 ?= "673"
-SRCREV_pn-openmoko-dialer2 ?= "4448"
-SRCREV_pn-openmoko-panel-gsm ?= "4335"
-SRCREV_pn-openmoko-dialer3 ?= "111"
-SRCREV_pn-openmoko-feedreader2 ?= "3645"
-SRCREV_pn-openmoko-firststart2 ?= "3158"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "4232"
-SRCREV_pn-openmoko-mediaplayer2 ?= "4173"
-SRCREV_pn-openmoko-messages2 ?= "4340"
-SRCREV_pn-openmoko-sample2 ?= "3537"
-SRCREV_pn-openmoko-sound-theme-standard2 ?= "4271"
-SRCREV_pn-openmoko-tasks2 ?= "403"
-SRCREV_pn-openmoko-terminal2 ?= "4039"
-SRCREV_pn-openmoko-theme-standard2 ?= "4338"
-SRCREV_pn-openmoko-today2-folders ?= "3704"
-SRCREV_pn-openmoko-today2 ?= "4168"
-SRCREV_pn-openmoko-worldclock2 ?= "3365"
-SRCREV_pn-usbpath-native = "3172"
-SRCREV_pn-usbpath = "3172"
 
 # Preferred Versions:
 #