diff --git a/conf/distro/angstrom-next.conf b/conf/distro/angstrom-next.conf
index 2b451d6..41fdd29 100644
--- a/conf/distro/angstrom-next.conf
+++ b/conf/distro/angstrom-next.conf
@@ -114,13 +114,12 @@ PREFERRED_PROVIDER_opkg                 ?= "opkg"
 PREFERRED_PROVIDER_opkg-native          ?= "opkg-native"
 PREFERRED_PROVIDER_udev                  = "systemd"
 
-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-ffmpeg = "libav is preferred over ffmpeg"
+# blacklist policy
 
+PNBLACKLIST[pn-fso-apm]       = "regular apmd is good enough"
+PNBLACKLIST[gconf-dbus]        = "gconf-dbus has been merged back into main GConf"
+PNBLACKLIST[gconf-dbus-native] = "gconf-dbus has been merged back into main GConf"
+PNBLACKLIST[ffmpeg] = "libav is preferred over ffmpeg"
 
 require conf/distro/include/angstrom.inc
 
@@ -185,7 +184,7 @@ DISTRO_EXTRA_RRECOMMENDS += " \
 SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
 
 DISTRO_FEATURES += "${LDISGOLD}"
-LDISGOLD_arm = "ld-is-gold"
+#LDISGOLD_arm = "ld-is-gold"
 LDISGOLD_x86 = "ld-is-gold"
 LDISGOLD_x86_64 = "ld-is-gold"
 LDISGOLD = ""
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 6cb4cfe..c3b21fd 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -1,5 +1,5 @@
 # eglibc:
-ANGSTROM_BLACKLIST_pn-libiconv = "the eglibc provided iconv library is used"
+PNBLACKLIST[libiconv] = "the eglibc provided iconv library is used"
 
 TARGET_OS = "linux"
 
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 9f06443..2a6e8de 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -1,7 +1,7 @@
 # glibc:
 require conf/distro/include/glibc-${TOOLCHAIN_TYPE}.inc
 
-ANGSTROM_BLACKLIST_pn-libiconv = "the glibc provided iconv library is used"
+PNBLACKLIST[libiconv] = "the glibc provided iconv library is used"
 
 TARGET_OS = "linux"
 TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"