diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf
index 9ce9e26..32ce730 100644
--- a/conf/distro/angstrom-2010.x.conf
+++ b/conf/distro/angstrom-2010.x.conf
@@ -73,8 +73,8 @@ PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}"
 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc 		?= "2.10.1"
 PREFERRED_VERSION_glibc-initial 	?= "2.10.1"
-PREFERRED_VERSION_uclibc        	?= "0.9.30.2"
-PREFERRED_VERSION_uclibc-initial	?= "0.9.30.2"
+PREFERRED_VERSION_uclibc        	?= "git"
+PREFERRED_VERSION_uclibc-initial	?= "git"
 PREFERRED_VERSION_eglibc		?= "2.12"
 PREFERRED_VERSION_eglibc-initial	?= "2.12"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 2147ec3..2037f17 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -224,7 +224,7 @@ SEPPUKU_COMPONENT    = "org.openembedded.dev"
 OESTATS_SERVER      ?= "tinderbox.openembedded.org"
 
 # We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam"
+DISTRO_FEATURES = "largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam xattr argp"
 
 # Use-like features
 DISTRO_FEATURES += "tk"