diff --git a/meta-linaro/conf/layer.conf b/meta-linaro/conf/layer.conf
index cce0f43..5c0dc64 100644
--- a/meta-linaro/conf/layer.conf
+++ b/meta-linaro/conf/layer.conf
@@ -5,7 +5,8 @@ RSP_ROOT ?= "sda1"
 BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have an images and various recipe-* directories, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/images/*.bb ${LAYERDIR}/images/*.bbappend ${LAYERDIR}/recipes-*/*.bb ${LAYERDIR}/recipes-*/*.bbappend"
+BBFILES := "${BBFILES} ${LAYERDIR}/images/*.bb ${LAYERDIR}/images/*.bbappend \
+            ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 	
 BBFILE_COLLECTIONS += "linaro"
 BBFILE_PATTERN_linaro := "^${LAYERDIR}/"
diff --git a/meta-linaro/recipes-devtools/gcc/gcc-4.5.1.linaro.inc b/meta-linaro/recipes-devtools/gcc/gcc-4.5.1.linaro.inc
index 43f5cd2..f145f85 100644
--- a/meta-linaro/recipes-devtools/gcc/gcc-4.5.1.linaro.inc
+++ b/meta-linaro/recipes-devtools/gcc/gcc-4.5.1.linaro.inc
@@ -49,6 +49,14 @@ SRC_URI = "http://launchpad.net/gcc-linaro/4.5/4.5-2010.11-0/+download/gcc-linar
 	   file://gcc-poison-parameters.patch \
 	  "
 
+ 
+do_move_src() {
+	echo moving ${WORKDIR}/gcc-linaro-4.5-2010.11-1 ${WORKDIR}/gcc-${PV}
+	mv ${WORKDIR}/gcc-linaro-4.5-2010.11-1 ${WORKDIR}/gcc-${PV}
+}
+
 do_unpack_append() {
-	mv gcc-linaro-4.5-2010.11-1 gcc-${PV}
+	bb.build.exec_func('do_move_src', d)
 }
+
+