diff --git a/cstool/cstool.c b/cstool/cstool.c
index a45dcd055d..48344429fb 100644
--- a/cstool/cstool.c
+++ b/cstool/cstool.c
@@ -455,12 +455,16 @@ int main(int argc, char **argv)
 					putchar(' ');
 				printf("%02x", insn[i].bytes[j]);
 			}
-			// X86 instruction size is variable.
+			// X86 and s390 instruction sizes are variable.
 			// align assembly instruction after the opcode
 			if (arch == CS_ARCH_X86) {
 				for (; j < 16; j++) {
 					printf("   ");
 				}
+			} else if (arch == CS_ARCH_SYSZ) {
+				for (; j < 6; j++) {
+					printf("   ");
+				}
 			}
 
 			printf("  %s\t%s\n", insn[i].mnemonic, insn[i].op_str);