diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index b828e36e36..9e39e534b9 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -67,6 +67,7 @@ SRCREV_pn-libxext-nativesdk ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d"
 SRCREV_pn-libxi ??= "d0326fe8cdbb08d4f52d79fd3fd4e1b2a0951d5e"
 SRCREV_pn-linux-openmoko ??= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
 SRCREV_pn-linux-omap3-pm ??= "totallybroken"
+SRCREV_pn-linux-libc-headers-wrs ??= "63a07cb64ccc3ceae619d3298545d602ab5ecd38"
 SRCREV_pn-matchbox-config-gtk ??= "2081"
 SRCREV_pn-matchbox-desktop-sato ??= "76"
 SRCREV_pn-matchbox-desktop ??= "2096"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index a99aba7966..c069009822 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -82,6 +82,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
 
 # Others:
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
+PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-libc-headers-nativesdk"
 PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
 PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
 PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-wrs_git.bb b/meta/packages/linux-libc-headers/linux-libc-headers-wrs_git.bb
new file mode 100644
index 0000000000..ab25e500ba
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-wrs_git.bb
@@ -0,0 +1,51 @@
+require linux-libc-headers.inc
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS += "unifdef-native"
+PROVIDES = "linux-libc-headers"
+PV = "2.6.34+git-${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;fullclone=1"
+
+S = "${WORKDIR}/linux"
+
+set_arch() {
+	case ${TARGET_ARCH} in
+		arm*)     ARCH=arm ;;
+		i*86*)    ARCH=i386 ;;
+		ia64*)    ARCH=ia64 ;;
+		mips*)    ARCH=mips ;;
+		powerpc*) ARCH=powerpc ;;
+		x86_64*)  ARCH=x86_64 ;;
+	esac
+}
+
+do_configure() {
+	set_arch
+	oe_runmake allnoconfig ARCH=$ARCH
+}
+
+do_wrlinux_checkout() {
+	if [ -d ${WORKDIR}/.git/refs/remotes/origin ]; then
+		rm -rf ${S}
+		mkdir ${S}
+		mv ${WORKDIR}/.git ${S}
+		mv ${S}/.git/refs/remotes/origin/* ${S}/.git/refs/heads
+		rmdir ${S}/.git/refs/remotes/origin
+	fi
+	cd ${S}
+	git checkout -f standard
+}
+
+addtask wrlinux_checkout before do_patch after do_unpack
+
+do_compile () {
+}
+
+do_install() {
+	set_arch
+	oe_runmake headers_install_all INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
+}
+
+BBCLASSEXTEND = "nativesdk"