diff --git a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
index 4b4fcca..9838854 100644
--- a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
+++ b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
@@ -1,7 +1,7 @@
-From a1efb073ccd93965f1a81802e42e188ee4156fc9 Mon Sep 17 00:00:00 2001
+From 87762dca565245bfb067f03ad315aaf012a6230e Mon Sep 17 00:00:00 2001
 From: Thadeu Lima De Souza Cascardo <thadeul@br.ibm.com>
 Date: Tue, 25 Mar 2014 10:45:16 -0400
-Subject: [PATCH 01/11] xhci: Use xhci_pci_remove for xhci device shutdown
+Subject: [PATCH 1/9] xhci: Use xhci_pci_remove for xhci device shutdown
 
 Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
 Signed-off-by: Joel Stanley <joel@jms.id.au>
diff --git a/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch b/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
index dde51c0..e82b3e4 100644
--- a/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
+++ b/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
@@ -1,7 +1,7 @@
-From 575e0185aec226044c9608750eec1b80a4bbac5c Mon Sep 17 00:00:00 2001
+From 8964043403b2b1990f5fa164473b18c4a9b88137 Mon Sep 17 00:00:00 2001
 From: Jeremy Kerr <jk@ozlabs.org>
 Date: Wed, 2 Mar 2016 11:25:47 +0800
-Subject: [PATCH 02/11] drivers/drm/ast: Switch SCU to VGA output on POST
+Subject: [PATCH 2/9] drivers/drm/ast: Switch SCU to VGA output on POST
 
 On AST BMC platforms, the BMC may be using the VGA device for UART
 mirroring. In this case, we need to switch the DAC output to
diff --git a/openpower/linux/0004-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch b/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
similarity index 98%
rename from openpower/linux/0004-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
rename to openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
index 5fded8e..22fd201 100644
--- a/openpower/linux/0004-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
+++ b/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
@@ -1,7 +1,7 @@
-From c19d3884d4d7ba338a2becfc67e90fa8fa2e8077 Mon Sep 17 00:00:00 2001
+From 78c036102f5821e8439d2da0d2ba7024dcd57ec5 Mon Sep 17 00:00:00 2001
 From: Huy Nguyen <huyn@mellanox.com>
 Date: Wed, 17 Feb 2016 17:24:26 +0200
-Subject: [PATCH 04/11] net/mlx4_core: Set UAR page size to 4KB regardless of
+Subject: [PATCH 3/9] net/mlx4_core: Set UAR page size to 4KB regardless of
  system page size
 
 problem description:
diff --git a/openpower/linux/0003-scsi-ignore-errors-from-scsi_dh_add_device.patch b/openpower/linux/0003-scsi-ignore-errors-from-scsi_dh_add_device.patch
deleted file mode 100644
index 56ff762..0000000
--- a/openpower/linux/0003-scsi-ignore-errors-from-scsi_dh_add_device.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 797cbcb8807688e465283dcc9551bc0cc02ada53 Mon Sep 17 00:00:00 2001
-From: Hannes Reinecke <hare@suse.de>
-Date: Tue, 1 Mar 2016 13:57:59 +1100
-Subject: [PATCH 03/11] scsi: ignore errors from scsi_dh_add_device()
-
-device handler initialisation might fail due to a number of
-reasons. But as device_handlers are optional this shouldn't
-cause us to disable the device entirely.
-So just ignore errors from scsi_dh_add_device().
-
-Reviewed-by: Johannes Thumshirn <jthumshirn@suse.com>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Signed-off-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Joel Stanley <joel@jms.id.au>
----
- drivers/scsi/scsi_sysfs.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
-index f7ae898833dd..7232d43e2207 100644
---- a/drivers/scsi/scsi_sysfs.c
-+++ b/drivers/scsi/scsi_sysfs.c
-@@ -1058,11 +1058,12 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
- 	}
- 
- 	error = scsi_dh_add_device(sdev);
--	if (error) {
-+	if (error)
-+		/*
-+		 * device_handler is optional, so any error can be ignored
-+		 */
- 		sdev_printk(KERN_INFO, sdev,
- 				"failed to add device handler: %d\n", error);
--		return error;
--	}
- 
- 	device_enable_async_suspend(&sdev->sdev_dev);
- 	error = device_add(&sdev->sdev_dev);
--- 
-2.8.1
-
diff --git a/openpower/linux/0005-xhci-do-not-halt-the-secondary-HCD.patch b/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch
similarity index 92%
rename from openpower/linux/0005-xhci-do-not-halt-the-secondary-HCD.patch
rename to openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch
index b6050f6..9de08cb 100644
--- a/openpower/linux/0005-xhci-do-not-halt-the-secondary-HCD.patch
+++ b/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch
@@ -1,7 +1,7 @@
-From 1fa191317a34d5178377c84fd89fb3737566bab1 Mon Sep 17 00:00:00 2001
+From c5075769d7124310b14f93e8ceb98f520a0b7087 Mon Sep 17 00:00:00 2001
 From: Joel Stanley <joel@jms.id.au>
 Date: Tue, 19 Jul 2016 22:43:26 +0930
-Subject: [PATCH 05/11] xhci: do not halt the secondary HCD
+Subject: [PATCH 4/9] xhci: do not halt the secondary HCD
 
 We can't halt the secondary HCD, because it's also the primary HCD,
 which will cause problems if we have devices attached to the primary
diff --git a/openpower/linux/0006-net-mlx5-Add-pci-shutdown-callback.patch b/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch
similarity index 97%
rename from openpower/linux/0006-net-mlx5-Add-pci-shutdown-callback.patch
rename to openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch
index db146ee..0e4c61a 100644
--- a/openpower/linux/0006-net-mlx5-Add-pci-shutdown-callback.patch
+++ b/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch
@@ -1,7 +1,7 @@
-From fc97456e71acaac19280241efd7937796cf88d5d Mon Sep 17 00:00:00 2001
+From 029b63c53cbd2092288ecb68e2304d880332a81f Mon Sep 17 00:00:00 2001
 From: Carol L Soto <clsoto@linux.vnet.ibm.com>
 Date: Tue, 12 Jul 2016 17:04:07 -0500
-Subject: [PATCH 06/11] net/mlx5: Add pci shutdown callback
+Subject: [PATCH 5/9] net/mlx5: Add pci shutdown callback
 
 Backport of commit 5fc7197d3a256 ("net/mlx5: Add pci shutdown callback")
 so we can use for the OpenPower kernel.
diff --git a/openpower/linux/0007-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch b/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
similarity index 98%
rename from openpower/linux/0007-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
rename to openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
index f5d44c5..e13da59 100644
--- a/openpower/linux/0007-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
+++ b/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
@@ -1,7 +1,7 @@
-From 1b982e3ba5646e5aad2399e72d34b7fde9b36fad Mon Sep 17 00:00:00 2001
+From b31da157b20a30a1de1221755bff5fd68c0da885 Mon Sep 17 00:00:00 2001
 From: Oliver O'Halloran <oohall@gmail.com>
 Date: Fri, 24 Jun 2016 17:28:43 +1000
-Subject: [PATCH 07/11] powerpc/boot: Add OPAL console to epapr wrappers
+Subject: [PATCH 6/9] powerpc/boot: Add OPAL console to epapr wrappers
 
 This patch adds an OPAL console backend to the powerpc boot wrapper so
 that decompression failures inside the wrapper can be reported to the
diff --git a/openpower/linux/0008-tty-hvc-Use-opal-irqchip-interface-if-available.patch b/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch
similarity index 89%
rename from openpower/linux/0008-tty-hvc-Use-opal-irqchip-interface-if-available.patch
rename to openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch
index 1336ab5..fac5f87 100644
--- a/openpower/linux/0008-tty-hvc-Use-opal-irqchip-interface-if-available.patch
+++ b/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch
@@ -1,7 +1,7 @@
-From f3d7e34f7b36b2e800a7fc93ecc292cec19319aa Mon Sep 17 00:00:00 2001
+From 07f6dc8103199529706a09d1ad0d7a3957e4ca69 Mon Sep 17 00:00:00 2001
 From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
 Date: Wed, 13 Jul 2016 11:15:42 +1000
-Subject: [PATCH 08/11] tty/hvc: Use opal irqchip interface if available
+Subject: [PATCH 7/9] tty/hvc: Use opal irqchip interface if available
 
 Update the hvc driver to use the OPAL irqchip if made available by the
 running firmware. If it is not present, the driver falls back to the
diff --git a/openpower/linux/0009-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch b/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
similarity index 95%
rename from openpower/linux/0009-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
rename to openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
index 7312e4e..0c96e14 100644
--- a/openpower/linux/0009-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
+++ b/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
@@ -1,7 +1,7 @@
-From 3b4ea30def24c57500e1564c788b263d70308210 Mon Sep 17 00:00:00 2001
+From ffcea460fb6082ad3e01168370fe4c0e562507b2 Mon Sep 17 00:00:00 2001
 From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
 Date: Wed, 13 Jul 2016 11:15:41 +1000
-Subject: [PATCH 09/11] tty/hvc: Use IRQF_SHARED for OPAL hvc consoles
+Subject: [PATCH 8/9] tty/hvc: Use IRQF_SHARED for OPAL hvc consoles
 
 Commit 2def86a7200c
 ("hvc: Convert to using interrupts instead of opal events")
diff --git a/openpower/linux/0009-Release-4.4.18-openpower1.patch b/openpower/linux/0009-Release-4.4.18-openpower1.patch
new file mode 100644
index 0000000..64d29ea
--- /dev/null
+++ b/openpower/linux/0009-Release-4.4.18-openpower1.patch
@@ -0,0 +1,32 @@
+From 24dbdaecf50eb930b11a691164b72061f79bcacd Mon Sep 17 00:00:00 2001
+From: Joel Stanley <joel@jms.id.au>
+Date: Tue, 16 Aug 2016 23:00:23 +0930
+Subject: [PATCH 9/9] Release 4.4.18-openpower1
+
+ - v4.4.18 stable release
+ - drop scsi: ignore errors from scsi_dh_add_device() as this is
+   upstream
+ - drop drivers/drm/ast: Update VGA Ownership register value as
+   this was found to not fix the issue it was claimed to have fixed
+
+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 eaedea88a8a7..71bb47cd7f53 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 4
+ PATCHLEVEL = 4
+ SUBLEVEL = 18
+-EXTRAVERSION =
++EXTRAVERSION = -openpower1
+ NAME = Blurry Fish Butt
+ 
+ # *DOCUMENTATION*
+-- 
+2.8.1
+
diff --git a/openpower/linux/0010-drivers-drm-ast-Update-VGA-Ownership-register-value.patch b/openpower/linux/0010-drivers-drm-ast-Update-VGA-Ownership-register-value.patch
deleted file mode 100644
index 2056550..0000000
--- a/openpower/linux/0010-drivers-drm-ast-Update-VGA-Ownership-register-value.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 26588c9a9f21292cd78e0aabeb3c0fbba0c8b1b0 Mon Sep 17 00:00:00 2001
-From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
-Date: Tue, 28 Jun 2016 00:31:48 +0530
-Subject: [PATCH 10/11] drivers/drm/ast: Update VGA Ownership register value
-
-Problem Description:
-Right now SCU2C: Control Register values are not set correctly to enable
-VGA mode. SCU2C register value is set to 0x00041080, where bit 18, 17,
-16 and bit 7 are set to 1 which is CRT mode.
-
-Fix:
-To enable VGA mode we have to set all register bit values to default
-values ie VGA mode.
-
-1) bit 18 in SCU2C register is to select  the DVO source for display output,
-   by default it is VGA mode but it was set to 1(CRT mode).
-
-	18  RW Select the DVO source for display output
-	0: VGA mode (default)
-	1: Graphics CRT mode
-
-2) bit 17 and 16 in SCU2C register is to select the DAC source for
-   display output, by default it is VGA mode but it was set to 1(CRT mode).
-	00: VGA mode
-	01: Grafics CRT mode
-	1X: pass-through DVO mode
-
-2) second issue is  bit 7 in SCU2C register is to Enable 2D CRT Mode
-   function as below and it was set to 1 as CRT mode.
-
-	7 Enable 2D CRT Mode function
-	0: VGA mode (default)
-	1: CRT mode
-
-The new value of SCU2C register is updated with mask value ~0x70080,
-which will enable VGA mode by resetting bits 18,17,16 and 7 in SCU2C
-control register.
-
-Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
-Acked-By: Jeremy Kerr <jk@ozlabs.org>
-Signed-off-by: Joel Stanley <joel@jms.id.au>
----
- drivers/gpu/drm/ast/ast_post.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
-index 703dba2ba84b..00ebe4fa0381 100644
---- a/drivers/gpu/drm/ast/ast_post.c
-+++ b/drivers/gpu/drm/ast/ast_post.c
-@@ -1681,7 +1681,7 @@ static void ast_init_output_control(struct drm_device *dev)
- 		break;
- 	default:
- 		/* VGA only: enable DAC output */
--		val &= ~0x30000;
-+		val &= ~0x70080;
- 		break;
- 	}
- 
--- 
-2.8.1
-
diff --git a/openpower/linux/0011-Release-4.4.17-openpower1.patch b/openpower/linux/0011-Release-4.4.17-openpower1.patch
deleted file mode 100644
index d6effe5..0000000
--- a/openpower/linux/0011-Release-4.4.17-openpower1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8a7cfa5f840ca9174dc2b4b3effb4121ecd4748a Mon Sep 17 00:00:00 2001
-From: Joel Stanley <joel@jms.id.au>
-Date: Thu, 14 Apr 2016 21:40:26 +0930
-Subject: [PATCH 11/11] Release 4.4.17-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 76d34f763a41..eaf063f19799 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 4
- PATCHLEVEL = 4
- SUBLEVEL = 17
--EXTRAVERSION =
-+EXTRAVERSION = -openpower1
- NAME = Blurry Fish Butt
- 
- # *DOCUMENTATION*
--- 
-2.8.1
-