diff --git a/buildroot b/buildroot
index 17f1172..4a064c9 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 17f117295f545db5207c0a6ffd515035af0c4f49
+Subproject commit 4a064c9005c800a115a81cc8be0627a35a5954d6
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index d272364..453797b 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -1,5 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"