diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index 4ac110a..4eae3ef 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -43,7 +43,7 @@
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/open-power/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e824e6e6703395305408777ea3a930886cb7f3e9"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8adc30a30b88c793c2058e85426f4f94158797ad"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
 BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index 5ac5023..3dd7751 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -41,7 +41,7 @@
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/open-power/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e824e6e6703395305408777ea3a930886cb7f3e9"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8adc30a30b88c793c2058e85426f4f94158797ad"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
 BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 41f5489..381b92b 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -43,7 +43,7 @@
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/open-power/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e824e6e6703395305408777ea3a930886cb7f3e9"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8adc30a30b88c793c2058e85426f4f94158797ad"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
 BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index fac587a..e10d5e4 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -31,7 +31,7 @@
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/open-power/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e824e6e6703395305408777ea3a930886cb7f3e9"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8adc30a30b88c793c2058e85426f4f94158797ad"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
 BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 1d08654..9ebb2c5 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -42,7 +42,7 @@
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/open-power/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e824e6e6703395305408777ea3a930886cb7f3e9"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8adc30a30b88c793c2058e85426f4f94158797ad"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
 BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
diff --git a/openpower/package/skiboot/skiboot-0003-Makefile-specify-abiv1.patch b/openpower/package/skiboot/skiboot-0003-Makefile-specify-abiv1.patch
deleted file mode 100644
index ad729d3..0000000
--- a/openpower/package/skiboot/skiboot-0003-Makefile-specify-abiv1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 11bff93ad1ca613b1db9d96e9ea9c46b7d7bf48d Mon Sep 17 00:00:00 2001
-From: Jeremy Kerr <jk@ozlabs.org>
-Date: Thu, 5 Mar 2015 22:44:40 +1100
-Subject: [PATCH] Makefile: specify abiv1
-
-Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
----
- Makefile.main | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.main b/Makefile.main
-index 3c67037..76f0bd3 100644
---- a/Makefile.main
-+++ b/Makefile.main
-@@ -51,6 +51,7 @@ CPPFLAGS += -DBITS_PER_LONG=64 -DHAVE_BIG_ENDIAN
- CPPFLAGS += -ffreestanding
- 
- CFLAGS := -fno-strict-aliasing -fstack-protector-all -pie -mbig-endian -m64
-+CFLAGS += -mabi=elfv1
- CFLAGS += -Wl,--oformat,elf64-powerpc
- 
- ifeq ($(SKIBOOT_GCOV),1)
--- 
-1.9.1
-
diff --git a/openpower/package/skiboot/skiboot-0004-Fix-compile-failures-on-RHEL6.patch b/openpower/package/skiboot/skiboot-0004-Fix-compile-failures-on-RHEL6.patch
deleted file mode 100644
index 2f226a4..0000000
--- a/openpower/package/skiboot/skiboot-0004-Fix-compile-failures-on-RHEL6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3600e0e9bf8bb45039ba32df45994c28bb6419cc Mon Sep 17 00:00:00 2001
-From: Patrick Williams <iawillia@us.ibm.com>
-Date: Tue, 4 Aug 2015 11:27:09 -0500
-Subject: [PATCH] Fix compile failures on RHEL6.
-
----
- Makefile.main | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.main b/Makefile.main
-index 3851c20..1f2b673 100644
---- a/Makefile.main
-+++ b/Makefile.main
-@@ -19,11 +19,9 @@ CWARNS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
- 	  -Werror-implicit-function-declaration -Wdeclaration-after-statement \
- 	  -Wno-pointer-sign -Wextra -Wno-sign-compare \
- 	  -Wmissing-prototypes -Wmissing-declarations \
--	  -Wwrite-strings -Wcast-align -Wjump-misses-init \
-+	  -Wwrite-strings -Wcast-align \
- 	  -Winit-self \
--	  -Wsuggest-attribute=const \
--	  -Wsuggest-attribute=noreturn \
--	  -Wframe-larger-than=1024 -Wstack-usage=1024 \
-+	  -Wframe-larger-than=1024 \
- 	  -Werror -Wno-error=format
- 
- # Host tools and options
--- 
-2.4.4
-