diff --git a/openpower/linux/linux-0018-Fix-crash-in-ast-fbcon-on-boot.patch b/openpower/linux/linux-0018-Fix-crash-in-ast-fbcon-on-boot.patch
new file mode 100644
index 0000000..5e55969
--- /dev/null
+++ b/openpower/linux/linux-0018-Fix-crash-in-ast-fbcon-on-boot.patch
@@ -0,0 +1,31 @@
+From d56cf122d12632a0015e19778a71c88f80799227 Mon Sep 17 00:00:00 2001
+From: Stewart Smith <stewart@linux.vnet.ibm.com>
+Date: Sat, 3 Oct 2015 11:02:31 +1000
+Subject: [PATCH 1/2] Fix crash in ast fbcon on boot
+
+theory is ops->cur_blink_jiffies is not getting initialised before adding
+the timer
+
+Reported-by: Stephanie M Swanson <swanman@us.ibm.com>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
+---
+ drivers/video/console/fbcon.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
+index 1aaf893..45d2a0a 100644
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
+@@ -416,6 +416,8 @@ static void fbcon_add_cursor_timer(struct fb_info *info)
+ 			INIT_WORK(&info->queue, fb_flashcursor);
+ 
+ 		init_timer(&ops->cursor_timer);
++		if (ops->cur_blink_jiffies < 1)
++			ops->cur_blink_jiffies = msecs_to_jiffies(200);
+ 		ops->cursor_timer.function = cursor_timer_handler;
+ 		ops->cursor_timer.expires = jiffies + ops->cur_blink_jiffies;
+ 		ops->cursor_timer.data = (unsigned long ) info;
+-- 
+1.7.1
+
diff --git a/openpower/linux/linux-0018-Release-4.2.1-openpower1.patch b/openpower/linux/linux-0018-Release-4.2.1-openpower1.patch
deleted file mode 100644
index 289a627..0000000
--- a/openpower/linux/linux-0018-Release-4.2.1-openpower1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5c51532db6ffcf1ec521a8a0d19cf3e814f6b428 Mon Sep 17 00:00:00 2001
-From: Joel Stanley <joel@jms.id.au>
-Date: Fri, 11 Sep 2015 16:09:56 +0930
-Subject: [PATCH 18/18] Release 4.2.1-openpower1
-
-Signed-off-by: Joel Stanley <joel@jms.id.au>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index a03efc1..49bbfb6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 4
- PATCHLEVEL = 2
- SUBLEVEL = 1
--EXTRAVERSION =
-+EXTRAVERSION = -openpower1
- NAME = Hurr durr I'ma sheep
- 
- # *DOCUMENTATION*
--- 
-2.5.0
-
diff --git a/openpower/linux/linux-0019-Release-4.2.1-openpower2.patch b/openpower/linux/linux-0019-Release-4.2.1-openpower2.patch
new file mode 100644
index 0000000..2e0e847
--- /dev/null
+++ b/openpower/linux/linux-0019-Release-4.2.1-openpower2.patch
@@ -0,0 +1,26 @@
+From 185b564ab788e84bb7b07482f7fdbb816b209b46 Mon Sep 17 00:00:00 2001
+From: Stewart Smith <stewart@linux.vnet.ibm.com>
+Date: Sat, 3 Oct 2015 11:07:20 +1000
+Subject: [PATCH 2/2] Release 4.2.1-openpower2
+
+Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a03efc1..ca21a06 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 4
+ PATCHLEVEL = 2
+ SUBLEVEL = 1
+-EXTRAVERSION =
++EXTRAVERSION = -openpower2
+ NAME = Hurr durr I'ma sheep
+ 
+ # *DOCUMENTATION*
+-- 
+1.7.1
+