diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index 7f4f2b00bb..d0e4751706 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -19,10 +19,27 @@ PREFERRED_VERSION_libx11-trim ?= "1.2.1"
 PREFERRED_VERSION_libdrm ?= ""
 PREFERRED_VERSION_xf86-input-keyboard ?= ""
 PREFERRED_VERSION_dri2proto ?= ""
-PREFERRED_VERSION_carrick ?= "1.1.13"
-PREFERRED_VERSION_nbtk ?= "1.2.3"
 
 
+PREFERRED_VERSION_anerley ?= "0.1.7"
+PREFERRED_VERSION_bickley ?= "0.4"
+PREFERRED_VERSION_bisho ?= "0.17.1"
+PREFERRED_VERSION_bognor-regis ?= "0.5.0"
+PREFERRED_VERSION_carrick ?= "1.1.13"
+PREFERRED_VERSION_dalston ?= "0.1.12"
+PREFERRED_VERSION_gupnp-av ?= "0.4"
+PREFERRED_VERSION_hornsey ?= "1.0"
+PREFERRED_VERSION_mojito ?= "0.21.7"
+PREFERRED_VERSION_nbtk ?= "1.2.3"
+PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2"
+PREFERRED_VERSION_moblin-panel-media ?= "0.0.7"
+PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12"
+PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2"
+PREFERRED_VERSION_moblin-panel-people ?= "0.0.9"
+PREFERRED_VERSION_moblin-panel-status ?= "0.0.9"
+PREFERRED_VERSION_mutter ?= "2.28.1"
+PREFERRED_VERSION_mutter-moblin ?= "0.43.8"
+
 SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
 SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892"
 SRCREV_pn-dri2proto ?= "66c56ab10d917e3f47f93178d7eac6430970d3c4"
@@ -38,7 +55,7 @@ SRCREV_pn-clutter-box2d ?= "2bcf5b836548dc4909e13b8ae7f60dc64c93d559"
 SRCREV_pn-clutter-gst ?= "db9bcf9d6f3a7d0f34747bed0f3ab28d7eb8f6ab"
 SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36"
 SRCREV_pn-clutter-imcontext ?= "2cb6f0ff153db639a489e58e36802e0e928b1968"
-SRCREV_pn-clutter-mozembed ?= "5a5329425aec7fe7749e97fd8c430457259f6165"
+SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751"
 SRCREV_pn-connman ?= "fd401dcd103a309e22c00d66f5c91375bfc9cce4"
 SRCREV_pn-connman-gnome ?= "4e38b3885654ee9256416e985b7fc615d18462b9"
 SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
@@ -48,7 +65,7 @@ SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878"
 SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
 SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
 SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
-SRCREV_pn-librest ?= "ff4561e2a8c38f49127f6e3b2ce7c238a29e1571"
+SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47"
 SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
 SRCREV_pn-mobile-broadband-provider-info ?= "35ef359c591cccd99380225fa431855b16a12edc"
 SRCREV_pn-moblin-app-installer ?= "7f7d50079c8bcc63874fd60a61f23d849e025445"
@@ -63,10 +80,10 @@ SRCREV_pn-moblin-panel-myzone ?= "54d9bee3a40a7700a69582a76aba89e213410046"
 SRCREV_pn-moblin-panel-pasteboard ?= "44411a4516e6ae22767662430fa37ed6a7d27a15"
 SRCREV_pn-moblin-panel-people ?= "0766282d120587919718b3bcb91553af1a1a00da"
 SRCREV_pn-moblin-panel-status ?= "fb10eaf16bbd064c12587ec8c734abe72a9841d3"
-SRCREV_pn-moblin-web-browser ?= "a3ea71159bef93dc03762195bd5404a51db5e4a6"
+SRCREV_pn-moblin-web-browser ?= "78ddd155cc297811720e4c4835d468ac6c4d9666"
 SRCREV_pn-mojito ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
-SRCREV_pn-mozilla-headless ?= "1a622cb7c384"
-SRCREV_pn-mozilla-headless-services ?= "9091da493c679c546ec7312b653e63f9701d5c8f"
+SRCREV_pn-mozilla-headless ?= "177d8b8bda61"
+SRCREV_pn-mozilla-headless-services ?= "c679b95dd8c2807b70186d233b3833861a499315"
 SRCREV_pn-mutter ?= "c96345dd81176f171c2d15dd9d5c5b20f334f842"
 SRCREV_pn-mutter-moblin ?= "7a23e0d63cc31c12dab9de517de04b0ecf41b28a"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index 999e0d1dfa..4594d48bac 100644
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -5,9 +5,13 @@ SRCREV_pn-bisho ?= "7b97cf8a9e2ef228be71e549e622df5d59869b39"
 
 SRCREV_pn-ashford ?= "${AUTOREV}"
 SRCREV_pn-anerley ?= "${AUTOREV}"
+PREFERRED_VERSION_anerley ?= "0.1.7+git%"
 SRCREV_pn-bickley ?= "${AUTOREV}"
+PREFERRED_VERSION_bickley ?= "0.4+git%"
 SRCREV_pn-bisho ?= "${AUTOREV}"
+PREFERRED_VERSION_bisho ?= "0.17.1+git%"
 SRCREV_pn-bognor-regis ?= "${AUTOREV}"
+PREFERRED_VERSION_bognor-regis ?= "0.5.0+git%"
 SRCREV_pn-carrick ?= "${AUTOREV}"
 PREFERRED_VERSION_carrick ?= "1.2.0+git%"
 SRCREV_pn-clutter ?= "${AUTOREV}"
@@ -20,9 +24,12 @@ SRCREV_pn-connman ?= "${AUTOREV}"
 SRCREV_pn-connman-gnome ?= "${AUTOREV}"
 SRCREV_pn-contacts ?= "${AUTOREV}"
 SRCREV_pn-dalston ?= "${AUTOREV}"
+PREFERRED_VERSION_dalston ?= "0.1.12+git%"
 SRCREV_pn-dates ?= "${AUTOREV}"
 SRCREV_pn-gconnman ?= "${AUTOREV}"
+PREFERRED_VERSION_gupnp-av ?= "0.5.2"
 SRCREV_pn-hornsey ?= "${AUTOREV}"
+PREFERRED_VERSION_hornsey ?= "1.0+git%"
 SRCREV_pn-json-glib ?= "${AUTOREV}"
 SRCREV_pn-libccss ?= "${AUTOREV}"
 SRCREV_pn-librest ?= "${AUTOREV}"
@@ -36,16 +43,25 @@ SRCREV_pn-moblin-web-browser ?= "${AUTOREV}"
 SRCREV_pn-moblin-icon-theme ?= "${AUTOREV}"
 SRCREV_pn-moblin-user-skel ?= "${AUTOREV}"
 SRCREV_pn-moblin-panel-applications ?= "${AUTOREV}"
+PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2+git%"
 SRCREV_pn-moblin-panel-media ?= "${AUTOREV}"
+PREFERRED_VERSION_moblin-panel-media ?= "0.0.7+git%"
 SRCREV_pn-moblin-panel-myzone ?= "${AUTOREV}"
+PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12+git%"
 SRCREV_pn-moblin-panel-pasteboard ?= "${AUTOREV}"
+PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2+git%"
 SRCREV_pn-moblin-panel-people ?= "${AUTOREV}"
+PREFERRED_VERSION_moblin-panel-people ?= "0.0.9+git%"
 SRCREV_pn-moblin-panel-status ?= "${AUTOREV}"
+PREFERRED_VERSION_moblin-panel-status ?= "0.0.9+git%"
 SRCREV_pn-mojito ?= "${AUTOREV}"
+PREFERRED_VERSION_mojito ?= "0.21.7+git%"
 SRCREV_pn-mozilla-headless ?= "${AUTOREV}"
 SRCREV_pn-mozilla-headless-services ?= "${AUTOREV}"
 SRCREV_pn-mutter ?= "${AUTOREV}"
+PREFERRED_VERSION_mutter ?= "2.28.1+git%"
 SRCREV_pn-mutter-moblin ?= "${AUTOREV}"
+PREFERRED_VERSION_mutter-moblin ?= "0.43.8+git%"
 SRCREV_pn-mux ?= "${AUTOREV}"
 SRCREV_pn-nbtk ?= "${AUTOREV}"
 PREFERRED_VERSION_nbtk ?= "1.2.3+git%
@@ -57,20 +73,20 @@ SRCREV_pn-tasks ?= "${AUTOREV}"
 SRCREV_pn-twitter-glib ?= "${AUTOREV}"
 SRCREV_pn-xf86-video-gma500 ?= "${AUTOREV}"
 
-PREFERRED_VERSION_mesa-dri ?= ""
-PREFERRED_VERSION_xf86-video-intel ?= ""
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= ""
-PREFERRED_VERSION_libdrm ?= ""
-PREFERRED_VERSION_xf86-input-keyboard ?= ""
-PREFERRED_VERSION_dri2proto ?= ""
-PREFERRED_VERSION_libx11-trim ?= ""
+SRCREV_pn-libdrm ?= "${AUTOREV}"
+PREFERRED_VERSION_libdrm ?= "2.4.7+git%"
+SRCREV_pn-mesa-dri ?= "${AUTOREV}"
+PREFERRED_VERSION_mesa-dri ?= "7.5+git%"
+SRCREV_pn-xf86-video-intel ?= "${AUTOREV}"
+PREFERRED_VERSION_xf86-video-intel ?= "2.7.1+git%"
+SRCREV_pn-xserver-xf86-dri-lite ?= "${AUTOREV}"
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6+git%"
+SRCREV_pn-xf86-input-keyboard ?= "${AUTOREV}"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2+git%"
+SRCREV_pn-dri2proto ?= "${AUTOREV}"
+PREFERRED_VERSION_dri2proto ?= "1.99.3+git%"
+SRCREV_pn-libx11-trim ?= "${AUTOREV}"
+PREFERRED_VERSION_libx11-trim ?= "1.2.1+git%"
+
 PREFERRED_VERSION_libxcb ?= "1.3"
 PREFERRED_VERSION_xcb-proto ?= "1.5"
-
-SRCREV_pn-xf86-video-intel ?= "${AUTOREV}"
-SRCREV_pn-xserver-xf86-dri-lite ?= "${AUTOREV}"
-SRCREV_pn-mesa-dri ?= "${AUTOREV}"
-SRCREV_pn-libdrm ?= "${AUTOREV}"
-SRCREV_pn-xf86-input-keyboard ?= "${AUTOREV}"
-SRCREV_pn-dri2proto ?= "${AUTOREV}"
-SRCREV_pn-libx11-trim ?= "${AUTOREV}"
diff --git a/meta-moblin/packages/anerley/anerley.inc b/meta-moblin/packages/anerley/anerley.inc
new file mode 100644
index 0000000000..94a5692d87
--- /dev/null
+++ b/meta-moblin/packages/anerley/anerley.inc
@@ -0,0 +1,6 @@
+DESCRIPTION = "People widgets for Moblin User Experience"
+SRC_URI = "http://download.moblin.org/sources/anerley/0.1/anerley-${PV}.tar.bz2"
+LICENSE = "LGPLv2.1"
+DEPENDS = "telepathy-glib glib-2.0 telepathy-mission-control nbtk eds-dbus"
+
+inherit autotools_stage
diff --git a/meta-moblin/packages/anerley/anerley_0.1.7.bb b/meta-moblin/packages/anerley/anerley_0.1.7.bb
new file mode 100644
index 0000000000..a2d491bffe
--- /dev/null
+++ b/meta-moblin/packages/anerley/anerley_0.1.7.bb
@@ -0,0 +1,3 @@
+require anerley.inc
+
+PR = "r0"
diff --git a/meta-moblin/packages/anerley/anerley_git.bb b/meta-moblin/packages/anerley/anerley_git.bb
index bd9b043273..a656d424ff 100644
--- a/meta-moblin/packages/anerley/anerley_git.bb
+++ b/meta-moblin/packages/anerley/anerley_git.bb
@@ -1,11 +1,7 @@
-DESCRIPTION = "People widgets for Moblin User Experience"
+require anerley.inc
+
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-LICENSE = "LGPLv2.1"
-PV = "0.0+git${SRCPV}"
-PR = "r2"
+PV = "0.1.7+git${SRCPV}"
+PR = "r0"
 
 S = "${WORKDIR}/git"
-
-DEPENDS = "telepathy-glib glib-2.0 telepathy-mission-control nbtk eds-dbus"
-
-inherit autotools_stage
diff --git a/meta-moblin/packages/bickley/bickley.inc b/meta-moblin/packages/bickley/bickley.inc
new file mode 100644
index 0000000000..423b53544b
--- /dev/null
+++ b/meta-moblin/packages/bickley/bickley.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "A meta data manager API and framework (including Media)"
+SRC_URI = "http://download.moblin.org/sources/bickley/0.4/bickley-0.4_20091124.tar.bz2"
+
+DEPENDS = "gtk+ dbus-glib clutter-gst libexif taglib gupnp gupnp-av samba"
+RDEPENDS = "xdg-user-dirs"
+
+FILES_${PN} =+ "${datadir}/dbus-1/services/"
+
+inherit autotools_stage
diff --git a/meta-moblin/packages/bickley/bickley_0.4.bb b/meta-moblin/packages/bickley/bickley_0.4.bb
new file mode 100644
index 0000000000..9a8de22619
--- /dev/null
+++ b/meta-moblin/packages/bickley/bickley_0.4.bb
@@ -0,0 +1,4 @@
+require bickley.inc
+
+S = "${WORKDIR}/${PN}-${PV}_20091124"
+PR = "r1"
diff --git a/meta-moblin/packages/bickley/bickley_git.bb b/meta-moblin/packages/bickley/bickley_git.bb
index 1949e7c768..a02d610ddc 100644
--- a/meta-moblin/packages/bickley/bickley_git.bb
+++ b/meta-moblin/packages/bickley/bickley_git.bb
@@ -1,13 +1,5 @@
-DESCRIPTION = "A meta data manager API and framework (including Media)"
+require bickley.inc
+
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
-
-DEPENDS = "gtk+ dbus-glib clutter-gst libexif taglib gupnp gupnp-av samba"
-RDEPENDS = "xdg-user-dirs"
-
+PV = "0.4+git${SRCPV}"
 S = "${WORKDIR}/git"
-
-FILES_${PN} =+ "${datadir}/dbus-1/services/"
-
-inherit autotools_stage
diff --git a/meta-moblin/packages/bisho/bisho.inc b/meta-moblin/packages/bisho/bisho.inc
new file mode 100644
index 0000000000..c2f6617f4d
--- /dev/null
+++ b/meta-moblin/packages/bisho/bisho.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "Web Services Settings"
+SRC_URI = "http://download.moblin.org/sources/bisho/0.17/bisho-0.17.1.tar.bz2"
+LICENSE = "GPLv2"
+
+DEPENDS = "gtk+ mojito nbtk"
+
+inherit autotools_stage
+
+FILES_${PN} += "${datadir}/icons/"
diff --git a/meta-moblin/packages/bisho/bisho_0.17.1.bb b/meta-moblin/packages/bisho/bisho_0.17.1.bb
new file mode 100644
index 0000000000..e483da5d79
--- /dev/null
+++ b/meta-moblin/packages/bisho/bisho_0.17.1.bb
@@ -0,0 +1 @@
+require bisho.inc
diff --git a/meta-moblin/packages/bisho/bisho_git.bb b/meta-moblin/packages/bisho/bisho_git.bb
index 383d49e43b..21a2e7afc7 100644
--- a/meta-moblin/packages/bisho/bisho_git.bb
+++ b/meta-moblin/packages/bisho/bisho_git.bb
@@ -1,13 +1,5 @@
-DESCRIPTION = "Web Services Settings"
+require bisho.inc
+
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-LICENSE = "GPLv2"
-PV = "0.0+git${SRCPV}"
-PR = "r0"
-
-DEPENDS = "gtk+ mojito nbtk"
-
+PV = "0.17.1+git${SRCPV}"
 S = "${WORKDIR}/git"
-
-inherit autotools_stage
-
-FILES_${PN} += "${datadir}/icons/"
diff --git a/meta-moblin/packages/bognor-regis/bognor-regis.inc b/meta-moblin/packages/bognor-regis/bognor-regis.inc
new file mode 100644
index 0000000000..e70ff0ca70
--- /dev/null
+++ b/meta-moblin/packages/bognor-regis/bognor-regis.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "Media deamon and play queue manager"
+SRC_URI = "http://download.moblin.org/sources/bognor-regis/0.5/bognor-regis-0.5.0_20091116.tar.bz2"
+LICENSE = "GPLv2"
+
+DEPENDS = "glib-2.0 dbus-glib gtk+ libnotify gupnp gupnp-av"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
diff --git a/meta-moblin/packages/bognor-regis/bognor-regis_0.5.0.bb b/meta-moblin/packages/bognor-regis/bognor-regis_0.5.0.bb
new file mode 100644
index 0000000000..5bec1aa388
--- /dev/null
+++ b/meta-moblin/packages/bognor-regis/bognor-regis_0.5.0.bb
@@ -0,0 +1,3 @@
+require bognor-regis.inc
+
+S = "${WORKDIR}/${PN}-${PV}_20091116"
diff --git a/meta-moblin/packages/bognor-regis/bognor-regis_git.bb b/meta-moblin/packages/bognor-regis/bognor-regis_git.bb
index 123e9298f2..6bc69d8dee 100644
--- a/meta-moblin/packages/bognor-regis/bognor-regis_git.bb
+++ b/meta-moblin/packages/bognor-regis/bognor-regis_git.bb
@@ -1,13 +1,5 @@
-DESCRIPTION = "Media deamon and play queue manager"
+require bognor-regis.inc
+
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-LICENSE = "GPLv2"
-PV = "0.0+git${SRCPV}"
-PR = "r0"
-
+PV = "0.5.0+git${SRCPV}"
 S = "${WORKDIR}/git"
-
-DEPENDS = "glib-2.0 dbus-glib gtk+ libnotify gupnp gupnp-av"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
-inherit autotools_stage
diff --git a/meta-moblin/packages/dalston/dalston.inc b/meta-moblin/packages/dalston/dalston.inc
new file mode 100644
index 0000000000..bd137d7731
--- /dev/null
+++ b/meta-moblin/packages/dalston/dalston.inc
@@ -0,0 +1,7 @@
+DESCRIPTION = "System Information Icons"
+SRC_URI = "http://download.moblin.org/sources/dalston/0.1/dalston-0.1.12.tar.bz2"
+LICENSE = "LGPLv2.1"
+
+DEPENDS = "glib-2.0 gtk+ pulseaudio libcanberra libnotify nbtk mutter-moblin"
+
+inherit autotools_stage
diff --git a/meta-moblin/packages/dalston/dalston_0.1.12.bb b/meta-moblin/packages/dalston/dalston_0.1.12.bb
new file mode 100644
index 0000000000..4af8ebeb21
--- /dev/null
+++ b/meta-moblin/packages/dalston/dalston_0.1.12.bb
@@ -0,0 +1 @@
+require dalston.inc
diff --git a/meta-moblin/packages/dalston/dalston_git.bb b/meta-moblin/packages/dalston/dalston_git.bb
index 9987438008..c61cb2b772 100644
--- a/meta-moblin/packages/dalston/dalston_git.bb
+++ b/meta-moblin/packages/dalston/dalston_git.bb
@@ -1,11 +1,6 @@
-DESCRIPTION = "System Information Icons"
+require dalston.inc
+
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-LICENSE = "LGPLv2.1"
-PV = "0.0+git${SRCPV}"
-PR = "r0"
-
-DEPENDS = "glib-2.0 gtk+ pulseaudio libcanberra libnotify nbtk mutter-moblin"
-
+PV = "0.1.12+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
diff --git a/meta-moblin/packages/hornsey/hornsey.inc b/meta-moblin/packages/hornsey/hornsey.inc
new file mode 100644
index 0000000000..a987381900
--- /dev/null
+++ b/meta-moblin/packages/hornsey/hornsey.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "The Moblin Media Player"
+SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
+LICENSE = "LGPLv2.1"
+
+SRC_URI = "http://download.moblin.org/sources/hornsey/1.0/hornsey-1.0_20091116.tar.bz2"
+
+DEPENDS = "clutter-1.0 clutter-gtk clutter-gst bickley bognor-regis nbtk startup-notification libunique"
+
+EXTRA_OECONF = "--disable-shave"
+
+FILES_${PN} += "${datadir}/icons"
+
+inherit autotools_stage
diff --git a/meta-moblin/packages/hornsey/hornsey_1.0.bb b/meta-moblin/packages/hornsey/hornsey_1.0.bb
new file mode 100644
index 0000000000..0eca9f2fbc
--- /dev/null
+++ b/meta-moblin/packages/hornsey/hornsey_1.0.bb
@@ -0,0 +1,3 @@
+require hornsey.inc
+
+S = "${WORKDIR}/${PN}-${PV}_20091116"
\ No newline at end of file
diff --git a/meta-moblin/packages/hornsey/hornsey_git.bb b/meta-moblin/packages/hornsey/hornsey_git.bb
index 403563f7f4..df01150017 100644
--- a/meta-moblin/packages/hornsey/hornsey_git.bb
+++ b/meta-moblin/packages/hornsey/hornsey_git.bb
@@ -1,15 +1,5 @@
-DESCRIPTION = "The Moblin Media Player"
+require hornsey.inc
+
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-LICENSE = "LGPLv2.1"
-PV = "0.0+git${SRCPV}"
-PR = "r2"
-
-DEPENDS = "clutter-1.0 clutter-gtk clutter-gst bickley bognor-regis nbtk startup-notification libunique"
-
-EXTRA_OECONF = "--disable-shave"
-
+PV = "1.0+git${SRCPV}"
 S = "${WORKDIR}/git"
-
-FILES_${PN} += "${datadir}/icons"
-
-inherit autotools_stage
diff --git a/meta-moblin/packages/librest/librest_git.bb b/meta-moblin/packages/librest/librest_git.bb
index ad60c2eca1..3944e1cb48 100644
--- a/meta-moblin/packages/librest/librest_git.bb
+++ b/meta-moblin/packages/librest/librest_git.bb
@@ -1,6 +1,6 @@
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.1+git${SRCPV}"
+PV = "0.6.1+git${SRCPV}"
 PR = "r0"
 
 DEPENDS = "libsoup-2.4"
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch
new file mode 100644
index 0000000000..d4785eaddf
--- /dev/null
+++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch
@@ -0,0 +1,35 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac	2010-01-13 14:57:52.000000000 +0000
++++ git/configure.ac	2010-01-13 15:01:35.000000000 +0000
+@@ -57,6 +57,13 @@
+ NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk"
+ AC_SUBST(NBTKDATADIR)
+ 
++IDLPREFIX=
++AC_ARG_WITH(idl-prefix, AC_HELP_STRING([--with-idl-prefix=DIR],[prefix to add to access to the idl files]), with_idl_prefix=${withval})
++if test x"${with_idl_prefix}" != x ; then
++   IDLPREFIX=${with_idl_prefix}
++fi
++AC_SUBST([IDLPREFIX])
++
+ if test "x$build_browser" = "xyes"; then
+    PKG_CHECK_MODULES(MWB,
+          clutter-1.0
+Index: git/libmwbpages/Makefile.am
+===================================================================
+--- git.orig/libmwbpages/Makefile.am	2010-01-13 14:57:52.000000000 +0000
++++ git/libmwbpages/Makefile.am	2010-01-13 15:02:20.000000000 +0000
+@@ -26,10 +26,10 @@
+ mwb-pages-service.lo : MwbIPagesService.h
+ 
+ .idl.h :
+-	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
++	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
+ 
+ .idl.xpt :
+-	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
++	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
+ 
+ xpt_DATA = MwbIPagesService.xpt
+ xptdir = $(pkgdatadir)/components
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch
new file mode 100644
index 0000000000..d4785eaddf
--- /dev/null
+++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch
@@ -0,0 +1,35 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac	2010-01-13 14:57:52.000000000 +0000
++++ git/configure.ac	2010-01-13 15:01:35.000000000 +0000
+@@ -57,6 +57,13 @@
+ NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk"
+ AC_SUBST(NBTKDATADIR)
+ 
++IDLPREFIX=
++AC_ARG_WITH(idl-prefix, AC_HELP_STRING([--with-idl-prefix=DIR],[prefix to add to access to the idl files]), with_idl_prefix=${withval})
++if test x"${with_idl_prefix}" != x ; then
++   IDLPREFIX=${with_idl_prefix}
++fi
++AC_SUBST([IDLPREFIX])
++
+ if test "x$build_browser" = "xyes"; then
+    PKG_CHECK_MODULES(MWB,
+          clutter-1.0
+Index: git/libmwbpages/Makefile.am
+===================================================================
+--- git.orig/libmwbpages/Makefile.am	2010-01-13 14:57:52.000000000 +0000
++++ git/libmwbpages/Makefile.am	2010-01-13 15:02:20.000000000 +0000
+@@ -26,10 +26,10 @@
+ mwb-pages-service.lo : MwbIPagesService.h
+ 
+ .idl.h :
+-	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
++	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
+ 
+ .idl.xpt :
+-	$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
++	xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
+ 
+ xpt_DATA = MwbIPagesService.xpt
+ xptdir = $(pkgdatadir)/components
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
index caa1e74754..3f4b0758ad 100644
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
+++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)"
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
-           file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \
-           file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6"
+           file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666 \
+           file://xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch;patch=1;rev=78ddd155cc297811720e4c4835d468ac6c4d9666;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \
+           file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666"
 LICENSE = "LGPLv2.1"
 PV = "0.0+git${SRCPV}"
 PR = "r11"
diff --git a/meta-moblin/packages/mojito/mojito.inc b/meta-moblin/packages/mojito/mojito.inc
new file mode 100644
index 0000000000..7eee2edfb2
--- /dev/null
+++ b/meta-moblin/packages/mojito/mojito.inc
@@ -0,0 +1,13 @@
+SRC_URI = "http://download.moblin.org/sources/mojito/0.21/mojito-0.21.7.tar.bz2"
+
+DEPENDS = "libsoup-2.4 gconf-dbus librest glib-2.0 twitter-glib gnome-keyring"
+RDEPENDS_${PN} = "connman"
+
+inherit autotools_stage
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+FILES_${PN}-dbg += "${libdir}/mojito/sources/.debug/* ${libdir}/mojito/services/.debug/"
+
+PARALLEL_MAKE = ""
+
+EXTRA_OECONF = "--with-online=connman --disable-shave"
diff --git a/meta-moblin/packages/mojito/mojito_0.21.7.bb b/meta-moblin/packages/mojito/mojito_0.21.7.bb
new file mode 100644
index 0000000000..9f880e72da
--- /dev/null
+++ b/meta-moblin/packages/mojito/mojito_0.21.7.bb
@@ -0,0 +1 @@
+require mojito.inc
diff --git a/meta-moblin/packages/mojito/mojito_git.bb b/meta-moblin/packages/mojito/mojito_git.bb
index f0114aa2a1..ddaf688bfa 100644
--- a/meta-moblin/packages/mojito/mojito_git.bb
+++ b/meta-moblin/packages/mojito/mojito_git.bb
@@ -1,17 +1,5 @@
+require mojito.inc
+
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-PV = "0.1+git${SRCPV}"
-PR = "r5"
-
-DEPENDS = "libsoup-2.4 gconf-dbus librest glib-2.0 twitter-glib gnome-keyring"
-RDEPENDS_${PN} = "connman"
-
+PV = "0.21.7+git${SRCPV}"
 S = "${WORKDIR}/git"
-
-inherit autotools_stage
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-FILES_${PN}-dbg += "${libdir}/mojito/sources/.debug/* ${libdir}/mojito/services/.debug/"
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF = "--with-online=connman --disable-shave"
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc
new file mode 100644
index 0000000000..c5bff816bd
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "mutter-moblin nbtk gtk+ glib-2.0 clutter-1.0 gnome-menus"
+
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-applications/0.1/moblin-panel-applications-0.1.2.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications_0.1.2.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_0.1.2.bb
new file mode 100644
index 0000000000..b80506ee89
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_0.1.2.bb
@@ -0,0 +1 @@
+require moblin-panel-applications.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb
index 27f82361e9..21a42fb228 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb
@@ -1,15 +1,5 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "mutter-moblin nbtk gtk+ glib-2.0 clutter-1.0 gnome-menus"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-applications.inc
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
+PV = "0.1.2+git${SRCPV}"
 S = "${WORKDIR}/git"
-
-inherit autotools_stage
-
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc
new file mode 100644
index 0000000000..13b2854a2a
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "mutter-moblin bickley bognor-regis gtk+"
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-media/0.0/moblin-panel-media-0.0.7.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media_0.0.7.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-media_0.0.7.bb
new file mode 100644
index 0000000000..2d76297d8c
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-media_0.0.7.bb
@@ -0,0 +1 @@
+require moblin-panel-media.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb
index 3ebdde28c0..de1351bfdb 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb
@@ -1,15 +1,6 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "mutter-moblin bickley bognor-regis gtk+"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-media.inc
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
+PV = "0.0.7+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
-
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc
new file mode 100644
index 0000000000..0c17e844ce
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "nbtk mutter-moblin gtk+ mojito gconf libjana"
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-myzone/0.0/moblin-panel-myzone-0.0.12.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_0.0.12.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_0.0.12.bb
new file mode 100644
index 0000000000..a335f1984f
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_0.0.12.bb
@@ -0,0 +1 @@
+require moblin-panel-myzone.inc
\ No newline at end of file
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb
index 4ade4967c8..31904c8753 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb
@@ -1,15 +1,7 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "nbtk mutter-moblin gtk+ mojito gconf libjana"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-myzone.inc
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
+PV = "0.0.12+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
 
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc
new file mode 100644
index 0000000000..4eb8d99e6a
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "nbtk mutter-moblin gtk+ clutter-1.0"
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-pasteboard/0.0/moblin-panel-pasteboard-0.0.2.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_0.0.2.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_0.0.2.bb
new file mode 100644
index 0000000000..a992971092
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_0.0.2.bb
@@ -0,0 +1 @@
+require moblin-panel-pasteboard.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb
index a550c7039f..27394b4ea3 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb
@@ -1,15 +1,5 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "nbtk mutter-moblin gtk+ clutter-1.0"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-pasteboard.inc
 
+PV = "0.0.2+git${SRCPV}"
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
 S = "${WORKDIR}/git"
-
-inherit autotools_stage
-
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc
new file mode 100644
index 0000000000..2deb94ea54
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "nbtk mutter-moblin anerley gtk+ glib-2.0"
+
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-people/0.0/moblin-panel-people-0.0.9.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people_0.0.9.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-people_0.0.9.bb
new file mode 100644
index 0000000000..df52a0de4e
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-people_0.0.9.bb
@@ -0,0 +1 @@
+require moblin-panel-people.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb
index 8a8f54ff17..1361068d34 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb
@@ -1,15 +1,5 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "nbtk mutter-moblin anerley gtk+ glib-2.0"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-people.inc
 
+PV = "0.0.9+git${SRCPV}"
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
 S = "${WORKDIR}/git"
-
-inherit autotools_stage
-
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc
new file mode 100644
index 0000000000..0959f5ce51
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "Moblin Applications Panel Plugin"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "nbtk mutter-moblin dbus-glib clutter-1.0 telepathy-mission-control mojito"
+
+SRC_URI = "http://download.moblin.org/sources/moblin-panel-status/0.0/moblin-panel-status-0.0.9.tar.bz2"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+inherit autotools_stage
+
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status_0.0.9.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-status_0.0.9.bb
new file mode 100644
index 0000000000..99d0b4114c
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-status_0.0.9.bb
@@ -0,0 +1 @@
+require moblin-panel-status.inc
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb
index 1391858468..19fec102b8 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb
@@ -1,15 +1,6 @@
-DESCRIPTION = "Moblin Applications Panel Plugin"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "nbtk mutter-moblin dbus-glib clutter-1.0 telepathy-mission-control mojito"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
+require moblin-panel-status.inc
 
+PV = "0.0.9+git${SRCPV}"
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
-
diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin.inc b/meta-moblin/packages/mutter-moblin/mutter-moblin.inc
new file mode 100644
index 0000000000..a956e4bfc7
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/mutter-moblin.inc
@@ -0,0 +1,50 @@
+DESCRIPTION = "A Moblin specific plugin for the Mutter composite window manager"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+DEPENDS = "clutter-1.0 nbtk mutter gnome-menus mojito libjana anerley clutter-mozembed bickley bognor-regis"
+
+SRC_URI = "http://download.moblin.org/sources/mutter-moblin/0.43/mutter-moblin-0.43.8.tar.bz2 \
+           file://startup-notify.patch;patch=1 \
+           file://88mutter-panelapps.sh \
+           file://background-tile.png"
+
+FILES_${PN} += "\
+	${sysconfdir}/X11 \
+	${libdir}/metacity/plugins/clutter/*.so* \
+	${libdir}/mutter/plugins/*.so* \
+	${datadir}/mutter-moblin-netbook-plugin \
+	${datadir}/dbus-1/services \
+	${datadir}/moblin-panel-applications/theme \
+	${datadir}/moblin-panel-pasteboard/theme"
+FILES_${PN}-dbg += "${libdir}/metacity/plugins/clutter/.debug/*"
+FILES_${PN}-dbg += "${libdir}/mutter/plugins/.debug/*"
+
+ASNEEDED = ""
+
+EXTRA_OECONF = "--enable-ahoghill --enable-netpanel --enable-people"
+
+inherit autotools_stage
+
+do_configure_prepend () {
+	rm -f ${S}/build/autotools/gtk-doc.m4
+	cp ${WORKDIR}/background-tile.png ${S}/data/theme/panel/
+}
+
+do_install_append () {
+	install -d ${D}${sysconfdir}/X11/Xsession.d/
+	install ${WORKDIR}/88mutter-panelapps.sh ${D}${sysconfdir}/X11/Xsession.d/
+}
+
+
+pkg_postinst_${PN} () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+. ${sysconfdir}/init.d/functions
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/metacity/general/clutter_plugins '[moblin-netbook]'
+
+nbtk-create-image-cache ${datadir}/mutter-moblin/theme
+}
diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin_0.43.8.bb b/meta-moblin/packages/mutter-moblin/mutter-moblin_0.43.8.bb
new file mode 100644
index 0000000000..1136163a95
--- /dev/null
+++ b/meta-moblin/packages/mutter-moblin/mutter-moblin_0.43.8.bb
@@ -0,0 +1,6 @@
+require mutter-moblin.inc
+
+SRC_URI = "http://download.moblin.org/sources/mutter-moblin/0.43/mutter-moblin-0.43.8.tar.bz2 \
+           file://startup-notify.patch;patch=1 \
+           file://88mutter-panelapps.sh \
+           file://background-tile.png"
diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb b/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb
index 6d6016eed0..c68f68e0f3 100644
--- a/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb
+++ b/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb
@@ -1,8 +1,4 @@
-DESCRIPTION = "A Moblin specific plugin for the Mutter composite window manager"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-DEPENDS = "clutter-1.0 nbtk mutter gnome-menus mojito libjana anerley clutter-mozembed bickley bognor-regis"
-PV = "2.25.2+git${SRCPV}"
+PV = "0.43.8+git${SRCPV}"
 PR = "r11"
 
 SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
@@ -10,45 +6,5 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
            file://88mutter-panelapps.sh \
            file://background-tile.png"
 
-FILES_${PN} += "\
-	${sysconfdir}/X11 \
-	${libdir}/metacity/plugins/clutter/*.so* \
-	${libdir}/mutter/plugins/*.so* \
-	${datadir}/mutter-moblin-netbook-plugin \
-	${datadir}/dbus-1/services \
-	${datadir}/moblin-panel-applications/theme \
-	${datadir}/moblin-panel-pasteboard/theme"
-FILES_${PN}-dbg += "${libdir}/metacity/plugins/clutter/.debug/*"
-FILES_${PN}-dbg += "${libdir}/mutter/plugins/.debug/*"
-
 S = "${WORKDIR}/git"
 
-ASNEEDED = ""
-
-EXTRA_OECONF = "--enable-ahoghill --enable-netpanel --enable-people"
-
-inherit autotools_stage
-
-do_configure_prepend () {
-	rm -f ${S}/build/autotools/gtk-doc.m4
-	cp ${WORKDIR}/background-tile.png ${S}/data/theme/panel/
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/X11/Xsession.d/
-	install ${WORKDIR}/88mutter-panelapps.sh ${D}${sysconfdir}/X11/Xsession.d/
-}
-
-
-pkg_postinst_${PN} () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-
-. ${sysconfdir}/init.d/functions
-
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/metacity/general/clutter_plugins '[moblin-netbook]'
-
-nbtk-create-image-cache ${datadir}/mutter-moblin/theme
-}