diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
index c4125ee75a..0956d0f3c4 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
@@ -2,6 +2,7 @@ require linux-libc-headers.inc
 
 DEFAULT_PREFERENCE = "-1"
 INHIBIT_DEFAULT_DEPS = "1"
+PR = "r1"
 
 SRC_URI = " \
 	${KERNELORG_MIRROR}/pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2 \
@@ -35,7 +36,7 @@ do_install() {
 	set_arch
 	install -d ${D}${includedir}
 	cp -pfLR ${S}${includedir}/linux ${D}${includedir}/
-	cp -pfLR ${S}${includedir}/asm-${ARCH} ${D}${includedir}/asm
+	cp -pfLR ${S}${includedir}/asm-$ARCH ${D}${includedir}/asm
 	cp -pfLR ${S}${includedir}/asm-generic ${D}${includedir}/
 }
 
@@ -44,7 +45,7 @@ do_stage () {
 	install -d ${STAGING_INCDIR}
 	rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic
 	cp -pfLR ${S}${includedir}/linux ${STAGING_INCDIR}/
-	cp -pfLR ${S}${includedir}/asm-${ARCH} ${STAGING_INCDIR}/asm
+	cp -pfLR ${S}${includedir}/asm-$ARCH ${STAGING_INCDIR}/asm
 	cp -pfLR ${S}${includedir}/asm-generic ${STAGING_INCDIR}/
 	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
 	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
index 8e1c5dc3e8..e1f3627371 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "unifdef-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://arm-syscall-define.patch;patch=1"
@@ -38,7 +38,7 @@ do_compile () {
 
 do_install() {
 	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=${ARCH}
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
 }
 
 do_install_append_arm() {
@@ -52,7 +52,7 @@ do_stage () {
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
 	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=${ARCH}
-	if [ "${ARCH}" == "arm" ]; then
+	if [ "$ARCH" == "arm" ]; then
 		cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm
 	fi
 	install -d ${STAGING_INCDIR}
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
index 9bfc6354ee..420c7e854a 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
@@ -2,14 +2,12 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "unifdef-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2"
 
 S = "${WORKDIR}/linux-${PV}"
 
-export TARGET_ARCH
-
 set_arch() {
 	case ${TARGET_ARCH} in
 		alpha*)   ARCH=alpha ;;
@@ -39,7 +37,7 @@ do_compile () {
 
 do_install() {
 	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=${ARCH}
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
 }
 
 do_install_append_arm() {
@@ -53,7 +51,7 @@ do_stage () {
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
 	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=${ARCH}
-	if [ "${ARCH}" == "arm" ]; then
+	if [ "$ARCH" == "arm" ]; then
 		cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm
 	fi
 	install -d ${STAGING_INCDIR}