3 files changed, 4 insertions, 2 deletions
diff --git a/op.c b/op.c
index 8b47448715..e7250f1aae 100644
--- a/op.c
+++ b/op.c
@@ -5779,6 +5779,8 @@ Perl_peep(pTHX_ register OP *o)
 	case OP_GREPWHILE:
 	case OP_AND:
 	case OP_OR:
+	case OP_ANDASSIGN:
+	case OP_ORASSIGN:
 	case OP_COND_EXPR:
 	case OP_RANGE:
 	    o->op_seq = PL_op_seqmax++;
diff --git a/opcode.h b/opcode.h
index 7d9bd81caa..d9ec0d564a 100644
--- a/opcode.h
+++ b/opcode.h
@@ -1965,7 +1965,7 @@ EXT U32 PL_opargs[] = {
 	0x00000200,	/* flop */
 	0x00000600,	/* and */
 	0x00000600,	/* or */
-	0x00022606,	/* xor */
+	0x00022406,	/* xor */
 	0x00000640,	/* cond_expr */
 	0x00000604,	/* andassign */
 	0x00000604,	/* orassign */
diff --git a/opcode.pl b/opcode.pl
index 62683d78ff..6e56a10142 100755
--- a/opcode.pl
+++ b/opcode.pl
@@ -530,7 +530,7 @@ flop		range (or flop)		ck_null		1
 
 and		logical and		ck_null		|	
 or		logical or		ck_null		|	
-xor		logical xor		ck_null		fs|	S S	
+xor		logical xor		ck_null		fs2	S S	
 cond_expr	conditional expression	ck_null		d|	
 andassign	logical and assignment	ck_null		s|	
 orassign	logical or assignment	ck_null		s|