diff --git a/gas/ChangeLog b/gas/ChangeLog
index a6fb06e8597..9e3d26d8756 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-21  Christian Groessler  <chris@groessler.org>
+
+	* config/tc-z8k.c (md_assemble): Fix buffer overrun in operand[]
+	array.
+
 2005-04-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/obj-aout.h (S_IS_EXTERN): Removed.
diff --git a/gas/config/tc-z8k.c b/gas/config/tc-z8k.c
index 97f1341eda9..6937f2c72b9 100644
--- a/gas/config/tc-z8k.c
+++ b/gas/config/tc-z8k.c
@@ -1182,7 +1182,7 @@ md_assemble (char *str)
   char c;
   char *op_start;
   char *op_end;
-  struct z8k_op operand[3];
+  struct z8k_op operand[4];
   opcode_entry_type *opcode;
 
   /* Drop leading whitespace.  */