diff --git a/package/openpgm/Config.in b/package/openpgm/Config.in
index e34740c32a..8d6763924d 100644
--- a/package/openpgm/Config.in
+++ b/package/openpgm/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_OPENPGM
 	bool "openpgm"
-	depends on !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 # lacks required builtins
+	depends on !BR2_avr32 # toolchain lacks required intrinsics
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INET_IPV6
 	depends on BR2_USE_WCHAR
@@ -15,4 +15,4 @@ config BR2_PACKAGE_OPENPGM
 
 comment "openpgm needs a toolchain w/ wchar, threads, IPv6"
 	depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_INET_IPV6 && BR2_USE_WCHAR)
-	depends on !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
+	depends on !BR2_avr32
diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
index dad1dd4641..a74ce88f34 100644
--- a/package/zeromq/Config.in
+++ b/package/zeromq/Config.in
@@ -30,7 +30,7 @@ config BR2_PACKAGE_ZEROMQ
 config BR2_PACKAGE_ZEROMQ_PGM
 	bool "PGM/EPGM support"
 	depends on BR2_PACKAGE_ZEROMQ
-	depends on !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 # openpgm
+	depends on !BR2_avr32 # openpgm
 	select BR2_PACKAGE_OPENPGM
 	help
 	  Add support for Pragmatic General Multicast protocol (RFC 3208)