diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7670ee241c1..8a6161d8d7b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-08  Alan Modra  <amodra@gmail.com>
+
+	* config/tc-ppc.c (ppc_handle_align): Correct last patch.  Really
+	don't emit a group terminating nop for power9.  Simplify cpu
+	tests.
+
 2018-03-08  Alan Modra  <amodra@gmail.com>
 
 	* config/tc-ppc.c (ppc_handle_align): Don't emit a group
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index dc63d6091a1..ff76221dc00 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -6549,8 +6549,7 @@ ppc_handle_align (struct frag *fragP)
       md_number_to_chars (dest, 0x60000000, 4);
 
       if ((ppc_cpu & PPC_OPCODE_POWER6) != 0
-	  || (ppc_cpu & PPC_OPCODE_POWER7) != 0
-	  || (ppc_cpu & PPC_OPCODE_POWER8) != 0)
+	  && (ppc_cpu & PPC_OPCODE_POWER9) == 0)
 	{
 	  /* For power6, power7, and power8, we want the last nop to
 	     be a group terminating one.  Do this by inserting an
@@ -6570,8 +6569,7 @@ ppc_handle_align (struct frag *fragP)
 	      dest = group_nop->fr_literal;
 	    }
 
-	  if ((ppc_cpu & PPC_OPCODE_POWER7) != 0
-	      || (ppc_cpu & PPC_OPCODE_POWER8) != 0)
+	  if ((ppc_cpu & PPC_OPCODE_POWER7) != 0)
 	    {
 	      if (ppc_cpu & PPC_OPCODE_E500MC)
 		/* e500mc group terminating nop: "ori 0,0,0".  */