diff --git a/.gitmodules b/.gitmodules
index 324fa00..52777b0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "buildroot"]
 	path = buildroot
-	branch = 2017.02-op-build
+	branch = 2017.05-op-build
 	url = https://github.com/open-power/buildroot
diff --git a/buildroot b/buildroot
index 23118ce..cd06d25 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 23118cea706cc738c334b868606b19bfda016705
+Subproject commit cd06d25fde5d896a9a29b797cba0ca737c4b9ff4
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index c18604c..97c56fb 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index b079318..d538a80 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index 9e5bd55..29273a3 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index 21cb22e..41af05c 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index ddeefd8..ccdbb8d 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -1,8 +1,8 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/habanero-patches"
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index f40ace9..632c9d0 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig
index 432639b..0f65266 100644
--- a/openpower/configs/openpower_p9_mambo_defconfig
+++ b/openpower/configs/openpower_p9_mambo_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig
index 63feea3..6df1ccc 100644
--- a/openpower/configs/p9dsu_defconfig
+++ b/openpower/configs/p9dsu_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_4_9_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 0bf08e3..d222357 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -1,8 +1,8 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/palmetto-patches"
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index 13bc715..e62e197 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_4_9_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index 2a6a21c..050bb80 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_4_9_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index 9bca1f1..90ea33a 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_4_9_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
index d948a05..37febd5 100644
--- a/openpower/configs/zz_defconfig
+++ b/openpower/configs/zz_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
-BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GLIBC_VERSION_2_25=y
+BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"