diff --git a/gas/testsuite/gas/s390/zarch-z10.d b/gas/testsuite/gas/s390/zarch-z10.d
index 50a71387fc..2d7bc70bb0 100644
--- a/gas/testsuite/gas/s390/zarch-z10.d
+++ b/gas/testsuite/gas/s390/zarch-z10.d
@@ -91,32 +91,32 @@ Disassembly of section .text:
 .*:	ec 6a 74 57 d6 fc [	 ]*cgibnl	%r6,-42,1111\(%r7\)
 .*:	ec 6c 74 57 d6 fc [	 ]*cgibnh	%r6,-42,1111\(%r7\)
 .*:	ec 6c 74 57 d6 fc [	 ]*cgibnh	%r6,-42,1111\(%r7\)
-.*:	ec 6a 00 00 d6 7e [	 ]*cij	%r6,-42,10,1fe <foo\+0x1fe>
-.*:	ec 62 00 00 d6 7e [	 ]*cij	%r6,-42,2,204 <foo\+0x204>
-.*:	ec 62 00 00 d6 7e [	 ]*cij	%r6,-42,2,20a <foo\+0x20a>
-.*:	ec 64 00 00 d6 7e [	 ]*cij	%r6,-42,4,210 <foo\+0x210>
-.*:	ec 64 00 00 d6 7e [	 ]*cij	%r6,-42,4,216 <foo\+0x216>
-.*:	ec 66 00 00 d6 7e [	 ]*cij	%r6,-42,6,21c <foo\+0x21c>
-.*:	ec 66 00 00 d6 7e [	 ]*cij	%r6,-42,6,222 <foo\+0x222>
-.*:	ec 68 00 00 d6 7e [	 ]*cij	%r6,-42,8,228 <foo\+0x228>
-.*:	ec 68 00 00 d6 7e [	 ]*cij	%r6,-42,8,22e <foo\+0x22e>
-.*:	ec 6a 00 00 d6 7e [	 ]*cij	%r6,-42,10,234 <foo\+0x234>
-.*:	ec 6a 00 00 d6 7e [	 ]*cij	%r6,-42,10,23a <foo\+0x23a>
-.*:	ec 6c 00 00 d6 7e [	 ]*cij	%r6,-42,12,240 <foo\+0x240>
-.*:	ec 6c 00 00 d6 7e [	 ]*cij	%r6,-42,12,246 <foo\+0x246>
-.*:	ec 6a 00 00 d6 7c [	 ]*cgij	%r6,-42,10,24c <foo\+0x24c>
-.*:	ec 62 00 00 d6 7c [	 ]*cgij	%r6,-42,2,252 <foo\+0x252>
-.*:	ec 62 00 00 d6 7c [	 ]*cgij	%r6,-42,2,258 <foo\+0x258>
-.*:	ec 64 00 00 d6 7c [	 ]*cgij	%r6,-42,4,25e <foo\+0x25e>
-.*:	ec 64 00 00 d6 7c [	 ]*cgij	%r6,-42,4,264 <foo\+0x264>
-.*:	ec 66 00 00 d6 7c [	 ]*cgij	%r6,-42,6,26a <foo\+0x26a>
-.*:	ec 66 00 00 d6 7c [	 ]*cgij	%r6,-42,6,270 <foo\+0x270>
-.*:	ec 68 00 00 d6 7c [	 ]*cgij	%r6,-42,8,276 <foo\+0x276>
-.*:	ec 68 00 00 d6 7c [	 ]*cgij	%r6,-42,8,27c <foo\+0x27c>
-.*:	ec 6a 00 00 d6 7c [	 ]*cgij	%r6,-42,10,282 <foo\+0x282>
-.*:	ec 6a 00 00 d6 7c [	 ]*cgij	%r6,-42,10,288 <foo\+0x288>
-.*:	ec 6c 00 00 d6 7c [	 ]*cgij	%r6,-42,12,28e <foo\+0x28e>
-.*:	ec 6c 00 00 d6 7c [	 ]*cgij	%r6,-42,12,294 <foo\+0x294>
+.*:	ec 6a 00 00 d6 7e [	 ]*cijnl	%r6,-42,1fe <foo\+0x1fe>
+.*:	ec 62 00 00 d6 7e [	 ]*cijh	%r6,-42,204 <foo\+0x204>
+.*:	ec 62 00 00 d6 7e [	 ]*cijh	%r6,-42,20a <foo\+0x20a>
+.*:	ec 64 00 00 d6 7e [	 ]*cijl	%r6,-42,210 <foo\+0x210>
+.*:	ec 64 00 00 d6 7e [	 ]*cijl	%r6,-42,216 <foo\+0x216>
+.*:	ec 66 00 00 d6 7e [	 ]*cijne	%r6,-42,21c <foo\+0x21c>
+.*:	ec 66 00 00 d6 7e [	 ]*cijne	%r6,-42,222 <foo\+0x222>
+.*:	ec 68 00 00 d6 7e [	 ]*cije	%r6,-42,228 <foo\+0x228>
+.*:	ec 68 00 00 d6 7e [	 ]*cije	%r6,-42,22e <foo\+0x22e>
+.*:	ec 6a 00 00 d6 7e [	 ]*cijnl	%r6,-42,234 <foo\+0x234>
+.*:	ec 6a 00 00 d6 7e [	 ]*cijnl	%r6,-42,23a <foo\+0x23a>
+.*:	ec 6c 00 00 d6 7e [	 ]*cijnh	%r6,-42,240 <foo\+0x240>
+.*:	ec 6c 00 00 d6 7e [	 ]*cijnh	%r6,-42,246 <foo\+0x246>
+.*:	ec 6a 00 00 d6 7c [	 ]*cgijnl	%r6,-42,24c <foo\+0x24c>
+.*:	ec 62 00 00 d6 7c [	 ]*cgijh	%r6,-42,252 <foo\+0x252>
+.*:	ec 62 00 00 d6 7c [	 ]*cgijh	%r6,-42,258 <foo\+0x258>
+.*:	ec 64 00 00 d6 7c [	 ]*cgijl	%r6,-42,25e <foo\+0x25e>
+.*:	ec 64 00 00 d6 7c [	 ]*cgijl	%r6,-42,264 <foo\+0x264>
+.*:	ec 66 00 00 d6 7c [	 ]*cgijne	%r6,-42,26a <foo\+0x26a>
+.*:	ec 66 00 00 d6 7c [	 ]*cgijne	%r6,-42,270 <foo\+0x270>
+.*:	ec 68 00 00 d6 7c [	 ]*cgije	%r6,-42,276 <foo\+0x276>
+.*:	ec 68 00 00 d6 7c [	 ]*cgije	%r6,-42,27c <foo\+0x27c>
+.*:	ec 6a 00 00 d6 7c [	 ]*cgijnl	%r6,-42,282 <foo\+0x282>
+.*:	ec 6a 00 00 d6 7c [	 ]*cgijnl	%r6,-42,288 <foo\+0x288>
+.*:	ec 6c 00 00 d6 7c [	 ]*cgijnh	%r6,-42,28e <foo\+0x28e>
+.*:	ec 6c 00 00 d6 7c [	 ]*cgijnh	%r6,-42,294 <foo\+0x294>
 .*:	b9 72 a0 67 [	 ]*crtnl	%r6,%r7
 .*:	b9 72 20 67 [	 ]*crth	%r6,%r7
 .*:	b9 72 20 67 [	 ]*crth	%r6,%r7
@@ -261,32 +261,32 @@ Disassembly of section .text:
 .*:	ec 6a 74 57 c8 fd [	 ]*clgibnl	%r6,200,1111\(%r7\)
 .*:	ec 6c 74 57 c8 fd [	 ]*clgibnh	%r6,200,1111\(%r7\)
 .*:	ec 6c 74 57 c8 fd [	 ]*clgibnh	%r6,200,1111\(%r7\)
-.*:	ec 6a 00 00 c8 7f [	 ]*clij	%r6,200,10,5c6 <foo\+0x5c6>
-.*:	ec 62 00 00 c8 7f [	 ]*clij	%r6,200,2,5cc <foo\+0x5cc>
-.*:	ec 62 00 00 c8 7f [	 ]*clij	%r6,200,2,5d2 <foo\+0x5d2>
-.*:	ec 64 00 00 c8 7f [	 ]*clij	%r6,200,4,5d8 <foo\+0x5d8>
-.*:	ec 64 00 00 c8 7f [	 ]*clij	%r6,200,4,5de <foo\+0x5de>
-.*:	ec 66 00 00 c8 7f [	 ]*clij	%r6,200,6,5e4 <foo\+0x5e4>
-.*:	ec 66 00 00 c8 7f [	 ]*clij	%r6,200,6,5ea <foo\+0x5ea>
-.*:	ec 68 00 00 c8 7f [	 ]*clij	%r6,200,8,5f0 <foo\+0x5f0>
-.*:	ec 68 00 00 c8 7f [	 ]*clij	%r6,200,8,5f6 <foo\+0x5f6>
-.*:	ec 6a 00 00 c8 7f [	 ]*clij	%r6,200,10,5fc <foo\+0x5fc>
-.*:	ec 6a 00 00 c8 7f [	 ]*clij	%r6,200,10,602 <foo\+0x602>
-.*:	ec 6c 00 00 c8 7f [	 ]*clij	%r6,200,12,608 <foo\+0x608>
-.*:	ec 6c 00 00 c8 7f [	 ]*clij	%r6,200,12,60e <foo\+0x60e>
-.*:	ec 6a 00 00 c8 7d [	 ]*clgij	%r6,200,10,614 <foo\+0x614>
-.*:	ec 62 00 00 c8 7d [	 ]*clgij	%r6,200,2,61a <foo\+0x61a>
-.*:	ec 62 00 00 c8 7d [	 ]*clgij	%r6,200,2,620 <foo\+0x620>
-.*:	ec 64 00 00 c8 7d [	 ]*clgij	%r6,200,4,626 <foo\+0x626>
-.*:	ec 64 00 00 c8 7d [	 ]*clgij	%r6,200,4,62c <foo\+0x62c>
-.*:	ec 66 00 00 c8 7d [	 ]*clgij	%r6,200,6,632 <foo\+0x632>
-.*:	ec 66 00 00 c8 7d [	 ]*clgij	%r6,200,6,638 <foo\+0x638>
-.*:	ec 68 00 00 c8 7d [	 ]*clgij	%r6,200,8,63e <foo\+0x63e>
-.*:	ec 68 00 00 c8 7d [	 ]*clgij	%r6,200,8,644 <foo\+0x644>
-.*:	ec 6a 00 00 c8 7d [	 ]*clgij	%r6,200,10,64a <foo\+0x64a>
-.*:	ec 6a 00 00 c8 7d [	 ]*clgij	%r6,200,10,650 <foo\+0x650>
-.*:	ec 6c 00 00 c8 7d [	 ]*clgij	%r6,200,12,656 <foo\+0x656>
-.*:	ec 6c 00 00 c8 7d [	 ]*clgij	%r6,200,12,65c <foo\+0x65c>
+.*:	ec 6a 00 00 c8 7f [	 ]*clijnl	%r6,200,5c6 <foo\+0x5c6>
+.*:	ec 62 00 00 c8 7f [	 ]*clijh	%r6,200,5cc <foo\+0x5cc>
+.*:	ec 62 00 00 c8 7f [	 ]*clijh	%r6,200,5d2 <foo\+0x5d2>
+.*:	ec 64 00 00 c8 7f [	 ]*clijl	%r6,200,5d8 <foo\+0x5d8>
+.*:	ec 64 00 00 c8 7f [	 ]*clijl	%r6,200,5de <foo\+0x5de>
+.*:	ec 66 00 00 c8 7f [	 ]*clijne	%r6,200,5e4 <foo\+0x5e4>
+.*:	ec 66 00 00 c8 7f [	 ]*clijne	%r6,200,5ea <foo\+0x5ea>
+.*:	ec 68 00 00 c8 7f [	 ]*clije	%r6,200,5f0 <foo\+0x5f0>
+.*:	ec 68 00 00 c8 7f [	 ]*clije	%r6,200,5f6 <foo\+0x5f6>
+.*:	ec 6a 00 00 c8 7f [	 ]*clijnl	%r6,200,5fc <foo\+0x5fc>
+.*:	ec 6a 00 00 c8 7f [	 ]*clijnl	%r6,200,602 <foo\+0x602>
+.*:	ec 6c 00 00 c8 7f [	 ]*clijnh	%r6,200,608 <foo\+0x608>
+.*:	ec 6c 00 00 c8 7f [	 ]*clijnh	%r6,200,60e <foo\+0x60e>
+.*:	ec 6a 00 00 c8 7d [	 ]*clgijnl	%r6,200,614 <foo\+0x614>
+.*:	ec 62 00 00 c8 7d [	 ]*clgijh	%r6,200,61a <foo\+0x61a>
+.*:	ec 62 00 00 c8 7d [	 ]*clgijh	%r6,200,620 <foo\+0x620>
+.*:	ec 64 00 00 c8 7d [	 ]*clgijl	%r6,200,626 <foo\+0x626>
+.*:	ec 64 00 00 c8 7d [	 ]*clgijl	%r6,200,62c <foo\+0x62c>
+.*:	ec 66 00 00 c8 7d [	 ]*clgijne	%r6,200,632 <foo\+0x632>
+.*:	ec 66 00 00 c8 7d [	 ]*clgijne	%r6,200,638 <foo\+0x638>
+.*:	ec 68 00 00 c8 7d [	 ]*clgije	%r6,200,63e <foo\+0x63e>
+.*:	ec 68 00 00 c8 7d [	 ]*clgije	%r6,200,644 <foo\+0x644>
+.*:	ec 6a 00 00 c8 7d [	 ]*clgijnl	%r6,200,64a <foo\+0x64a>
+.*:	ec 6a 00 00 c8 7d [	 ]*clgijnl	%r6,200,650 <foo\+0x650>
+.*:	ec 6c 00 00 c8 7d [	 ]*clgijnh	%r6,200,656 <foo\+0x656>
+.*:	ec 6c 00 00 c8 7d [	 ]*clgijnh	%r6,200,65c <foo\+0x65c>
 .*:	b9 73 a0 67 [	 ]*clrtnl	%r6,%r7
 .*:	b9 73 20 67 [	 ]*clrth	%r6,%r7
 .*:	b9 73 20 67 [	 ]*clrth	%r6,%r7
diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c
index 2315f0bdbb..90dc4308db 100644
--- a/opcodes/s390-opc.c
+++ b/opcodes/s390-opc.c
@@ -512,9 +512,9 @@ const struct s390_operand s390_operands[] =
 #define MASK_RIE_RRP0     { 0xff, 0x00, 0x00, 0x00, 0xf0, 0xff }
 #define MASK_RIE_RRI0     { 0xff, 0x00, 0x00, 0x00, 0xf0, 0xff }
 #define MASK_RIE_RUPI     { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
-#define MASK_RIE_R0PI     { 0xff, 0x00, 0x00, 0x00, 0xf0, 0xff }
+#define MASK_RIE_R0PI     { 0xff, 0x0f, 0x00, 0x00, 0x00, 0xff }
 #define MASK_RIE_RUPU     { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
-#define MASK_RIE_R0PU     { 0xff, 0x00, 0x00, 0x00, 0xf0, 0xff }
+#define MASK_RIE_R0PU     { 0xff, 0x0f, 0x00, 0x00, 0x00, 0xff }
 #define MASK_RIE_R0IU     { 0xff, 0x0f, 0x00, 0x00, 0x0f, 0xff }
 #define MASK_RIE_R0I0     { 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff }
 #define MASK_RIE_R0UU     { 0xff, 0x0f, 0x00, 0x00, 0x0f, 0xff }