diff --git a/gas/ChangeLog b/gas/ChangeLog
index 417edc02daa..207d111d225 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-07  Alan Modra  <amodra@gmail.com>
+
+	* read.c (assemble_one, s_bundle_unlock): Formatting.
+	Consistently add comma and "bytes" to error message.
+	* testsuite/gas/i386/bundle-bad.l: Adjust to suit.
+
 2017-11-07  Alan Modra  <amodra@gmail.com>
 
 	* testsuite/gas/arm/got_prel.d,
diff --git a/gas/read.c b/gas/read.c
index 17e81627564..afa1a168a65 100644
--- a/gas/read.c
+++ b/gas/read.c
@@ -713,19 +713,19 @@ assemble_one (char *line)
       /* Make sure this hasn't pushed the locked sequence
 	 past the bundle size.  */
       unsigned int bundle_size = pending_bundle_size (bundle_lock_frag);
-      if (bundle_size > (1U << bundle_align_p2))
-	as_bad (_("\
-.bundle_lock sequence at %u bytes but .bundle_align_mode limit is %u bytes"),
+      if (bundle_size > 1U << bundle_align_p2)
+	as_bad (_ (".bundle_lock sequence at %u bytes, "
+		   "but .bundle_align_mode limit is %u bytes"),
 		bundle_size, 1U << bundle_align_p2);
     }
   else if (bundle_align_p2 > 0)
     {
       unsigned int insn_size = pending_bundle_size (insn_start_frag);
 
-      if (insn_size > (1U << bundle_align_p2))
-	as_bad (_("\
-single instruction is %u bytes long but .bundle_align_mode limit is %u"),
-		(unsigned int) insn_size, 1U << bundle_align_p2);
+      if (insn_size > 1U << bundle_align_p2)
+	as_bad (_("single instruction is %u bytes long, "
+		  "but .bundle_align_mode limit is %u bytes"),
+		insn_size, 1U << bundle_align_p2);
 
       finish_bundle (insn_start_frag, insn_size);
     }
@@ -6244,9 +6244,10 @@ s_bundle_unlock (int arg ATTRIBUTE_UNUSED)
 
   size = pending_bundle_size (bundle_lock_frag);
 
-  if (size > (1U << bundle_align_p2))
-    as_bad (_(".bundle_lock sequence is %u bytes, but bundle size only %u"),
-	    size, 1 << bundle_align_p2);
+  if (size > 1U << bundle_align_p2)
+    as_bad (_(".bundle_lock sequence is %u bytes, "
+	      "but bundle size is only %u bytes"),
+	    size, 1u << bundle_align_p2);
   else
     finish_bundle (bundle_lock_frag, size);
 
diff --git a/gas/testsuite/gas/i386/bundle-bad.l b/gas/testsuite/gas/i386/bundle-bad.l
index dd6a79398f9..9d90e483f09 100644
--- a/gas/testsuite/gas/i386/bundle-bad.l
+++ b/gas/testsuite/gas/i386/bundle-bad.l
@@ -1,9 +1,9 @@
 [^:]*: Assembler messages:
 [^:]*:4:.*\.bundle_lock is meaningless without \.bundle_align_mode
 [^:]*:6:.*\.bundle_unlock without preceding \.bundle_lock
-[^:]*:11:.*single instruction is [0-9]+ bytes long but \.bundle_align_mode limit is [0-9]+
-[^:]*:18:.*\.bundle_lock sequence at [0-9]+ bytes but \.bundle_align_mode limit is [0-9]+ bytes
-[^:]*:19:.*\.bundle_lock sequence is [0-9]+ bytes, but bundle size only [0-9]+
+[^:]*:11:.*single instruction is [0-9]+ bytes long, but \.bundle_align_mode limit is [0-9]+ bytes
+[^:]*:18:.*\.bundle_lock sequence at [0-9]+ bytes, but \.bundle_align_mode limit is [0-9]+ bytes
+[^:]*:19:.*\.bundle_lock sequence is [0-9]+ bytes, but bundle size is only [0-9]+ bytes
 [^:]*:26:.*cannot change section or subsection inside \.bundle_lock
 [^:]*:31:.*cannot change \.bundle_align_mode inside \.bundle_lock
 [^:]*:36:.*\.bundle_unlock without preceding \.bundle_lock