diff --git a/conf/distro/angstrom-bleeding.conf b/conf/distro/angstrom-bleeding.conf
deleted file mode 100644
index 3b24cef..0000000
--- a/conf/distro/angstrom-bleeding.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Bleeding edge version of angstrom
-# Only use for toolchain testing!
-
-ANGSTROM_GCC_VERSION                    ?= "4.6%"
-ANGSTROM_BINUTILS_VERSION               ?= "2.22"
-ANGSTROM_EGLIBC_VERSION                 ?= "2.15"
-ANGSTROM_UCLIBC_VERSION                 ?= "0.9.32+0.9.33%"
-
-require angstrom-2010.x.conf
-
-DISTRO_VERSION = "v${@time.strftime('%Y.%m',time.gmtime())}-bleeding-core"
-DISTRO_REVISION = "0"
-DISTRO_PR = ".10"
-
-# set feed path variables
-FEED_BASEPATH = "feeds/bleeding-core/${ANGSTROM_PKG_FORMAT}/${TCLIBC}/"
-
-DISTRO_FEATURES += "${LDISGOLD}"
-LDISGOLD_arm = "ld-is-gold"
-LDISGOLD_x86 = "ld-is-gold"
-LDISGOLD_x86_64 = "ld-is-gold"
-LDISGOLD = ""
-
diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-v2012.x.conf
similarity index 87%
rename from conf/distro/angstrom-2010.x.conf
rename to conf/distro/angstrom-v2012.x.conf
index 0ed1cb6..8cd8ba5 100644
--- a/conf/distro/angstrom-2010.x.conf
+++ b/conf/distro/angstrom-v2012.x.conf
@@ -8,7 +8,7 @@
 #@--------------------------------------------------------------------
 
 # This is a aimed to be the next stable angstrom release. 
-# If you want something stable *right now*, use angstrom-2008.1
+# If you want something stable *right now*, use angstrom-v2012.05
 #
 # Use this at your own risk, we welcome bugreports sent to
 #    angstrom-distro-devel@linuxtogo.org
@@ -16,12 +16,12 @@
 # For more contact info please visit
 #    http://www.angstrom-distribution.org/contact
 #
-# Again, in doubt, use DISTRO="angstrom-2008.1"
+# Again, in doubt, use the master branch of setup-scripts
 
-#DISTRO_VERSION = "2010.X"
+#DISTRO_VERSION = "v2012.X"
 DISTRO_VERSION = "v${@time.strftime('%Y.%m',time.gmtime())}-core"
 DISTRO_REVISION = "5"
-DISTRO_PR = ".9"
+DISTRO_PR = ".11"
 
 OLDEST_KERNEL = "2.6.16"
 
@@ -49,21 +49,9 @@ TOOLCHAIN_BRAND ?= ""
 # Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
 IMAGE_LINGUAS ?= '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}'
 
-
 # set feed path variables
 FEED_BASEPATH = "feeds/core/${ANGSTROM_PKG_FORMAT}/${TCLIBC}/"
 
-# Uncomment this to fetch packaged-staging packages from the central angstrom server
-#PSTAGE_MIRROR = "${ANGSTROM_URI}/${FEED_BASEPATH}packaged-staging"
-
-#Make sure we use 2.6 on machines with a 2.4/2.6 selector
-KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
-PCMCIA_MANAGER = "pcmciautils"
-
-#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
-
 #This is unrelated to the kernel version, but userspace apps (e.g. udev/systemd) require a recent version to build against
 LINUX_LIBC_HEADERS_VERSION ?= "3.2"
 PREFERRED_VERSION_linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}"
@@ -71,7 +59,7 @@ PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}"
 PREFERRED_VERSION_linux-libc-headers-nativesdk = "${LINUX_LIBC_HEADERS_VERSION}"
 
 
-ANGSTROM_EGLIBC_VERSION                 ?= "2.12"
+ANGSTROM_EGLIBC_VERSION                 ?= "2.15"
 ANGSTROM_GLIBC_VERSION                  ?= "2.10.1"
 ANGSTROM_UCLIBC_VERSION                 ?= "0.9.32"
 
@@ -96,18 +84,13 @@ PREFERRED_VERSION_cross-localedef-native ?= "${ANGSTROM_EGLIBC_VERSION}"
 # Blackfin has its on gcc
 ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
 
-# Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
-#KERNEL_CCSUFFIX_armv7a = "-4.2.1+csl-arm-2007q3-53"
-KERNEL_CCSUFFIX_archos5 = "-4.2.1+csl-arm-2007q3-53"
-KERNEL_CCSUFFIX_archos5it = "-4.2.1+csl-arm-2007q3-53"
-
 #avr32 only has support for gcc 4.2.2
 ANGSTROM_GCC_VERSION_avr32		         ?= "4.2.2"
 
 #Everybody else can just use this: 
-ANGSTROM_GCC_VERSION                             ?= "4.5"
+ANGSTROM_GCC_VERSION                             ?= "4.7"
 
-ANGSTROM_BINUTILS_VERSION                        ?= "2.20.1"
+ANGSTROM_BINUTILS_VERSION                        ?= "2.22"
 
 PREFERRED_VERSION_binutils                       ?= "${ANGSTROM_BINUTILS_VERSION}"
 PREFERRED_VERSION_binutils-cross                 ?= "${ANGSTROM_BINUTILS_VERSION}"
@@ -138,16 +121,12 @@ PREFERRED_PROVIDER-gconf-dbus            = "gconf"
 PREFERRED_PROVIDER_hotplug               = "udev"
 PREFERRED_PROVIDER_opkg                 ?= "opkg"
 PREFERRED_PROVIDER_opkg-native          ?= "opkg-native"
-ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez-libs 3.x has been replaced by bluez4"
-ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez-utils 3.x has been replaced by bluez4"
 
 ANGSTROM_BLACKLIST_pn-fso-apm       = "regular apmd is good enough"
 
 ANGSTROM_BLACKLIST_pn-gconf-dbus	= "gconf-dbus has been merged back into main GConf"
 ANGSTROM_BLACKLIST_pn-gconf-dbus-native	= "gconf-dbus has been merged back into main GConf"
 
-ANGSTROM_BLACKLIST_pn-ipkg			= "ipkg has been superseded by opkg"
-
 require conf/distro/include/angstrom.inc
 
 # Toolchain virtuals:
@@ -209,3 +188,9 @@ DISTRO_EXTRA_RRECOMMENDS += " \
 "
 
 SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
+
+DISTRO_FEATURES += "${LDISGOLD}"
+LDISGOLD_arm = "ld-is-gold"
+LDISGOLD_x86 = "ld-is-gold"
+LDISGOLD_x86_64 = "ld-is-gold"
+LDISGOLD = ""