diff --git a/conf/machine/jetson-tx1.conf b/conf/machine/jetson-tx1.conf
index 220a8422..7eeca087 100644
--- a/conf/machine/jetson-tx1.conf
+++ b/conf/machine/jetson-tx1.conf
@@ -8,9 +8,7 @@ DEFAULTTUNE = "aarch64"
 require conf/multilib.conf
 MULTILIBS = "multilib:lib32"
 DEFAULTTUNE_virtclass-multilib-lib32 = "armv7ahf-neon-vfpv4"
-# XXX - override until OE-Core problem is resolved
-ARMPKGSFX_FPU_virtclass-multilib-lib32 = "-vfp-neon-vfpv4"
-# XXX
+PACKAGE_EXTRA_ARCHS_append-tune-armv7ahf-neon-vfpv4 = " armv7ahf-vfp-vfpv4-neon"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-tegra"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-tegra"