diff --git a/gnomeos/yocto/classes/gnomeos-contents.bbclass b/gnomeos/yocto/classes/gnomeos-contents.bbclass
index 795e1a86..64f4d5f7 100644
--- a/gnomeos/yocto/classes/gnomeos-contents.bbclass
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -16,11 +16,13 @@ IMAGE_INSTALL = "libuuid1 \
 		 libogg0 \
 		 speex \
 		 libvorbis \
+                 libstdc++6 \
+                 libgnutls26 \
 		 "
 
 RECIPE_PACKAGES = "task-core-boot \
 		   coreutils \
-		   ostree ostree-init \
+		   ostree \
 		   strace \
 		   bash \
 		   tar \
diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
index 8d3aad4f..7cd85733 100644
--- a/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
@@ -26,4 +26,12 @@ IMAGE_INSTALL += "libuuid-dev \
 		  libogg-dev \
 		  speex-dev \
 		  libvorbis-dev \
+		  libstdc++-dev \
+		  libcap-dev \
+		  libcap-bin \
+		  libgpg-error-dev \
+		  libtasn1-dev \
+		  libtasn1-bin \
+		  libgcrypt-dev \
+		  libgnutls-dev \
 		  "
diff --git a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus
index 0b3a9dcd..67d0d82e 100644
--- a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus
+++ b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus
@@ -3,6 +3,7 @@
 start()
 {
 	echo -n "Starting dbus daemon: "
+	mkdir -p /var/run/dbus
 	/usr/bin/dbus-daemon --system
 }
 
diff --git a/gnomeos/yocto/recipies-core/ostree-init/ostree-init.bb b/gnomeos/yocto/recipies-core/ostree-init/ostree-init.bb
deleted file mode 100644
index a167ad78..00000000
--- a/gnomeos/yocto/recipies-core/ostree-init/ostree-init.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-SUMMARY = "Root switcher"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-SRC_URI = "file:///src/ostree-init"
-S = "${WORKDIR}/ostree-init"
-
-inherit autotools